From 7a7a8332105dfe65f2361caec1a7b9396977188f Mon Sep 17 00:00:00 2001 From: shi_jq Date: Mon, 17 Mar 2025 16:53:15 +0800 Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711=20711=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AlarmWidget/CAccidentReviewDialog.cpp | 2 +- .../AlarmWidget/CAccidentReviewDialog.h | 2 +- .../AlarmWidget/CAiAlarmDataCollect.cpp | 2 +- .../plugin/AlarmWidget/CAiAlarmDataCollect.h | 2 +- .../plugin/AlarmWidget/CAiAlarmDelegate.cpp | 2 +- .../gui/plugin/AlarmWidget/CAiAlarmDelegate.h | 2 +- .../plugin/AlarmWidget/CAiAlarmMsgInfo.cpp | 2 +- .../gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h | 2 +- .../plugin/AlarmWidget/CAiAlarmTreeItem.cpp | 2 +- .../gui/plugin/AlarmWidget/CAiAlarmTreeItem.h | 2 +- .../plugin/AlarmWidget/CAiAlarmTreeModel.cpp | 2 +- .../plugin/AlarmWidget/CAiAlarmTreeModel.h | 2 +- .../plugin/AlarmWidget/CAiAlarmTreeView.cpp | 2 +- .../gui/plugin/AlarmWidget/CAiAlarmTreeView.h | 2 +- .../gui/plugin/AlarmWidget/CAlarmBaseData.cpp | 18 +- .../gui/plugin/AlarmWidget/CAlarmBaseData.h | 2 +- .../gui/plugin/AlarmWidget/CAlarmColorInfo.h | 2 +- .../plugin/AlarmWidget/CAlarmColorWidget.cpp | 2 +- .../plugin/AlarmWidget/CAlarmColorWidget.h | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmCommon.h | 2 +- .../plugin/AlarmWidget/CAlarmDataCollect.cpp | 2 +- .../plugin/AlarmWidget/CAlarmDataCollect.h | 2 +- .../gui/plugin/AlarmWidget/CAlarmDelegate.cpp | 2 +- .../gui/plugin/AlarmWidget/CAlarmDelegate.h | 2 +- .../AlarmWidget/CAlarmDeviceTreeItem.cpp | 2 +- .../plugin/AlarmWidget/CAlarmDeviceTreeItem.h | 2 +- .../AlarmWidget/CAlarmDeviceTreeModel.cpp | 22 +- .../AlarmWidget/CAlarmDeviceTreeModel.h | 2 +- .../AlarmWidget/CAlarmDeviceTreeView.cpp | 46 +- .../plugin/AlarmWidget/CAlarmDeviceTreeView.h | 2 +- .../plugin/AlarmWidget/CAlarmFilterDialog.cpp | 2 +- .../plugin/AlarmWidget/CAlarmFilterDialog.h | 2 +- .../plugin/AlarmWidget/CAlarmFilterDialog.ui | 6 +- .../src/gui/plugin/AlarmWidget/CAlarmForm.cpp | 57 +- .../src/gui/plugin/AlarmWidget/CAlarmForm.h | 4 +- .../src/gui/plugin/AlarmWidget/CAlarmForm.ui | 853 ++++++++++-------- .../AlarmWidget/CAlarmInhibitDialog.cpp | 2 +- .../plugin/AlarmWidget/CAlarmInhibitDialog.h | 2 +- .../plugin/AlarmWidget/CAlarmItemModel.cpp | 18 +- .../gui/plugin/AlarmWidget/CAlarmItemModel.h | 2 +- .../plugin/AlarmWidget/CAlarmMediaPlayer.cpp | 54 +- .../plugin/AlarmWidget/CAlarmMediaPlayer.h | 5 +- .../gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp | 2 +- .../gui/plugin/AlarmWidget/CAlarmMsgInfo.h | 2 +- .../plugin/AlarmWidget/CAlarmMsgManage.cpp | 99 +- .../gui/plugin/AlarmWidget/CAlarmMsgManage.h | 18 +- .../gui/plugin/AlarmWidget/CAlarmPlugin.cpp | 48 +- .../src/gui/plugin/AlarmWidget/CAlarmPlugin.h | 17 +- .../plugin/AlarmWidget/CAlarmPluginWidget.cpp | 2 +- .../plugin/AlarmWidget/CAlarmPluginWidget.h | 4 +- .../gui/plugin/AlarmWidget/CAlarmSetDlg.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmSetDlg.h | 2 +- .../gui/plugin/AlarmWidget/CAlarmSetMng.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmSetMng.h | 2 +- .../plugin/AlarmWidget/CAlarmShiledDialog.cpp | 2 +- .../plugin/AlarmWidget/CAlarmTaskMngDlg.cpp | 2 +- .../gui/plugin/AlarmWidget/CAlarmTaskMngDlg.h | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmView.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmView.h | 2 +- .../gui/plugin/AlarmWidget/CAlarmWidget.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CAlarmWidget.h | 2 +- .../AlarmWidget/CDisposalPlanDialog.cpp | 2 +- .../plugin/AlarmWidget/CDisposalPlanDialog.h | 2 +- .../gui/plugin/AlarmWidget/CMyCalendar.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CMyCalendar.h | 2 +- .../gui/plugin/AlarmWidget/CMyCheckBox.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CMyCheckBox.h | 2 +- .../gui/plugin/AlarmWidget/CMyListWidget.cpp | 2 +- .../gui/plugin/AlarmWidget/CMyListWidget.h | 2 +- .../gui/plugin/AlarmWidget/CPdfPrinter.cpp | 2 +- .../src/gui/plugin/AlarmWidget/CPdfPrinter.h | 2 +- .../plugin/AlarmWidget/CTableViewPrinter.cpp | 2 +- .../plugin/AlarmWidget/CTableViewPrinter.h | 2 +- .../plugin/AlarmWidget/CTreeViewPrinter.cpp | 2 +- .../gui/plugin/AlarmWidget/CTreeViewPrinter.h | 2 +- product/src/gui/plugin/AlarmWidget/main.cpp | 4 +- 76 files changed, 792 insertions(+), 601 deletions(-) diff --git a/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp index 8b22972a..430d4f7a 100644 --- a/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.cpp @@ -1,4 +1,4 @@ -#include "CAccidentReviewDialog.h" +#include "CAccidentReviewDialog.h" #include "public/pub_utility_api/FileUtil.h" #include "public/pub_logger_api/logger.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.h b/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.h index 080fb279..6d475f81 100644 --- a/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.h +++ b/product/src/gui/plugin/AlarmWidget/CAccidentReviewDialog.h @@ -1,4 +1,4 @@ -#ifndef CACCIDENTREVIEWDIALOG_H +#ifndef CACCIDENTREVIEWDIALOG_H #define CACCIDENTREVIEWDIALOG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.cpp index de445cf6..8de3f444 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.cpp @@ -1,4 +1,4 @@ -#include "CAiAlarmDataCollect.h" +#include "CAiAlarmDataCollect.h" #include "pub_logger_api/logger.h" #include "CAlarmMsgManage.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h index 634e3bee..ab56bf83 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmDataCollect.h @@ -1,4 +1,4 @@ -#ifndef CAIALARMDATACOLLECT_H +#ifndef CAIALARMDATACOLLECT_H #define CAIALARMDATACOLLECT_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp index 207e3572..1d02cb41 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.cpp @@ -1,4 +1,4 @@ -#include "CAiAlarmDelegate.h" +#include "CAiAlarmDelegate.h" #include #include "pub_utility_api/FileUtil.h" #include "pub_utility_api/FileStyle.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.h index 2aba53c1..74a15e7f 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmDelegate.h @@ -1,4 +1,4 @@ -#ifndef CAIALARMDELEGATE_H +#ifndef CAIALARMDELEGATE_H #define CAIALARMDELEGATE_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp index b8a14e3b..dadde560 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.cpp @@ -1,4 +1,4 @@ -#include "CAiAlarmMsgInfo.h" +#include "CAiAlarmMsgInfo.h" #include #include "CAlarmDataCollect.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h index 7a229efd..15d7996f 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmMsgInfo.h @@ -1,4 +1,4 @@ -#ifndef CAIALARMMSGINFO_H +#ifndef CAIALARMMSGINFO_H #define CAIALARMMSGINFO_H diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.cpp index 27812968..b4529706 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.cpp @@ -1,4 +1,4 @@ -#include "CAiAlarmTreeItem.h" +#include "CAiAlarmTreeItem.h" #include "CAiAlarmMsgInfo.h" #include "CAlarmMsgInfo.h" #include "CAlarmCommon.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.h index 48e76b19..b15be0bb 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeItem.h @@ -1,4 +1,4 @@ -#ifndef CAIALARMTREEITEM_H +#ifndef CAIALARMTREEITEM_H #define CAIALARMTREEITEM_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.cpp index 29170081..3618bf09 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.cpp @@ -1,4 +1,4 @@ -#include "CAiAlarmTreeModel.h" +#include "CAiAlarmTreeModel.h" #include "CAlarmMsgManage.h" #include "CAiAlarmDataCollect.h" #include "CAlarmDataCollect.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.h index 021eddea..2d0e7655 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeModel.h @@ -1,4 +1,4 @@ -#ifndef CAIALARMTREEMODEL_H +#ifndef CAIALARMTREEMODEL_H #define CAIALARMTREEMODEL_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.cpp b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.cpp index 2c23b6bd..8a97822b 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.cpp @@ -1,4 +1,4 @@ -#include "CAiAlarmTreeView.h" +#include "CAiAlarmTreeView.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.h b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.h index e4af5631..77b60d21 100644 --- a/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.h +++ b/product/src/gui/plugin/AlarmWidget/CAiAlarmTreeView.h @@ -1,4 +1,4 @@ -#ifndef CAIALARMTREEVIEW_H +#ifndef CAIALARMTREEVIEW_H #define CAIALARMTREEVIEW_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp index 934cde75..68d4aeee 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.cpp @@ -1,8 +1,20 @@ -#include "CAlarmBaseData.h" +#include "CAlarmBaseData.h" #include "perm_mng_api/PermMngApi.h" #include "CAlarmCommon.h" #include "pub_logger_api/logger.h" + +//< 屏蔽xml_parser编译告警 +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#endif + #include "boost/property_tree/xml_parser.hpp" + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #include "boost/typeof/typeof.hpp" #include "boost/filesystem.hpp" #include "pub_utility_api/FileUtil.h" @@ -139,7 +151,7 @@ int CAlarmBaseData::queryDomainIdByLocId(int loactionId) if(m_ptrSysInfo) { SLocationInfo stLocationInfo; - if(kbdSuccess == m_ptrSysInfo->getLocationInfoById(loactionId, stLocationInfo)) + if(iotSuccess == m_ptrSysInfo->getLocationInfoById(loactionId, stLocationInfo)) { return stLocationInfo.nDomainId; } @@ -154,7 +166,7 @@ bool CAlarmBaseData::queryAllPointDevGroup(int nDomainId, int nSubsystemId, cons return false; } SAppInfo stAppInfo; - if(kbdSuccess != m_ptrSysInfo->getAppInfoBySubsystemId(nSubsystemId, stAppInfo)) + if(iotSuccess != m_ptrSysInfo->getAppInfoBySubsystemId(nSubsystemId, stAppInfo)) { LOGERROR("queryAllPointDevGroup 获取应用ID失败"); return false; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h index 1be2353e..de8d32ee 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmBaseData.h @@ -1,4 +1,4 @@ -#ifndef CALARMBASEDATA_H +#ifndef CALARMBASEDATA_H #define CALARMBASEDATA_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmColorInfo.h b/product/src/gui/plugin/AlarmWidget/CAlarmColorInfo.h index 79146fc2..c50aeb2b 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmColorInfo.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmColorInfo.h @@ -1,4 +1,4 @@ -#ifndef CALARMCOLORINFO_H +#ifndef CALARMCOLORINFO_H #define CALARMCOLORINFO_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.cpp index 3b55c115..828df000 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.cpp @@ -1,4 +1,4 @@ -#include "CAlarmColorWidget.h" +#include "CAlarmColorWidget.h" #include "ui_CAlarmColorWidget.h" #include #include "CAlarmSetMng.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.h b/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.h index afa257e1..e1dfaed4 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmColorWidget.h @@ -1,4 +1,4 @@ -#ifndef CALARMCOLORWIDGET_H +#ifndef CALARMCOLORWIDGET_H #define CALARMCOLORWIDGET_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmCommon.h b/product/src/gui/plugin/AlarmWidget/CAlarmCommon.h index b361f6b6..ec5d03b9 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmCommon.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmCommon.h @@ -1,4 +1,4 @@ -#ifndef CALARMCOMMON_H +#ifndef CALARMCOMMON_H #define CALARMCOMMON_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp index 4e973bc0..8edbd432 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.cpp @@ -1,4 +1,4 @@ -#include "CAlarmDataCollect.h" +#include "CAlarmDataCollect.h" #include #include "pub_logger_api/logger.h" #include "CAlarmMsgManage.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h index fdbbadbf..42bdef11 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDataCollect.h @@ -1,4 +1,4 @@ -#ifndef CALARMDATACOLLECT_H +#ifndef CALARMDATACOLLECT_H #define CALARMDATACOLLECT_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp index 843361b7..6fc50c49 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "CAlarmDelegate.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.h b/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.h index a81ea972..ab7fa038 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDelegate.h @@ -1,4 +1,4 @@ -#ifndef CALARMDELEGATE_H +#ifndef CALARMDELEGATE_H #define CALARMDELEGATE_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.cpp index 64301f10..f9575592 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CAlarmDeviceTreeItem.h" #include "pub_logger_api/logger.h" #include "Common.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.h b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.h index 35f93129..d0e3c9ba 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeItem.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.cpp index baee60de..208b3ed0 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.cpp @@ -1,4 +1,4 @@ -#include "CAlarmDeviceTreeItem.h" +#include "CAlarmDeviceTreeItem.h" #include "CAlarmDeviceTreeModel.h" #include "CAlarmMsgManage.h" #include "CAlarmBaseData.h" @@ -37,6 +37,20 @@ void CAlarmDeviceTreeModel::setupModelData(const QMapsetData("", Qt::ItemDataRole(TagRole)); + sys_device->setData(TYPE_DEVGROUP, Qt::ItemDataRole(TypeRole)); + sys_device->setData(vec.at(nDevIndex).domain, Qt::ItemDataRole(DomainRole)); + sys_device->setData(vec.at(nDevIndex).location, Qt::ItemDataRole(LocationRole)); + sys_device->setData(vec.at(nDevIndex).sub_system, Qt::ItemDataRole(SubsystemRole)); + sys_device->setData(vec.at(nDevIndex).region, Qt::ItemDataRole(RegionRole)); + QModelIndex sys_modelIndex = createIndex(nDevIndex+1, 0, sys_device); + m_devTagIndex.insert("", sys_modelIndex); + m_devNameIndex.insert("", sys_modelIndex); + } } } } @@ -160,9 +174,11 @@ QVariant CAlarmDeviceTreeModel::data(const QModelIndex &index, int role) const if (Qt::DisplayRole == role) { const QString &deviceGroup = item->data(Qt::ItemDataRole(TagRole)).toString(); - if(deviceGroup.isEmpty()) + int nType = item->data(Qt::ItemDataRole(TypeRole)).toInt(); + if(deviceGroup.isEmpty() && nType == TYPE_LOCATION) { - return item->data(Qt::DisplayRole).toString(); + //区域后面不加数量 + return item->data(Qt::DisplayRole).toString(); } return item->data(Qt::DisplayRole).toString() + QString(" [%1]").arg(m_alarmDeviceGroupStatistical.value(deviceGroup,0)); } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.h b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.h index 4a4e7208..253e1cee 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeModel.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.cpp index 485c5238..6c34ff49 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.cpp @@ -1,4 +1,4 @@ -#include "CAlarmDeviceTreeView.h" +#include "CAlarmDeviceTreeView.h" #include "CAlarmDeviceTreeModel.h" #include "CAlarmDeviceTreeItem.h" #include @@ -10,6 +10,7 @@ CAlarmDeviceTreeView::CAlarmDeviceTreeView(QWidget *parent) } +/* void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event) { CAlarmDeviceTreeModel * pModel = dynamic_cast(model()); @@ -33,25 +34,26 @@ void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event) } return; } +*/ -//void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event) -//{ -// CAlarmDeviceTreeModel * pModel = dynamic_cast(model()); -// if(Q_NULLPTR != pModel) -// { -// QMenu menu; -// CAlarmDeviceTreeItem * pItem = static_cast(indexAt(event->pos()).internalPointer()); -// if (Q_NULLPTR == pItem) -// { -// menu.addAction(tr("全选"), [=](){ pModel->setAllDeviceCheckState(Qt::Checked); }); -// menu.addAction(tr("清空"), [=](){ pModel->setAllDeviceCheckState(Qt::Unchecked); }); -// } -// else if (Q_NULLPTR != pItem && pItem->childCount() > 0) -// { -// menu.addAction(tr("选择"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Checked); }); -// menu.addAction(tr("清除"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Unchecked); }); -// } -// menu.exec(event->globalPos()); -// } -// return; -//} +void CAlarmDeviceTreeView::contextMenuEvent(QContextMenuEvent *event) +{ + CAlarmDeviceTreeModel * pModel = dynamic_cast(model()); + if(Q_NULLPTR != pModel) + { + QMenu menu; + CAlarmDeviceTreeItem * pItem = static_cast(indexAt(event->pos()).internalPointer()); + if (Q_NULLPTR == pItem) + { + menu.addAction(tr("全选"), [=](){ pModel->setAllDeviceCheckState(Qt::Checked); }); + menu.addAction(tr("清空"), [=](){ pModel->setAllDeviceCheckState(Qt::Unchecked); }); + } + else if (Q_NULLPTR != pItem && pItem->childCount() > 0) + { + menu.addAction(tr("选择"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Checked); }); + menu.addAction(tr("清除"), [=](){ pModel->setDeviceCheckState(indexAt(event->pos()), Qt::Unchecked); }); + } + menu.exec(event->globalPos()); + } + return; +} diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.h b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.h index b2f6d6d5..ceab3799 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmDeviceTreeView.h @@ -1,4 +1,4 @@ -#ifndef CALARMDEVICETREEVIEW_H +#ifndef CALARMDEVICETREEVIEW_H #define CALARMDEVICETREEVIEW_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp index 392a8c85..7374d486 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.cpp @@ -1,4 +1,4 @@ -#include "CAlarmFilterDialog.h" +#include "CAlarmFilterDialog.h" #include "ui_CAlarmFilterDialog.h" #include "public/pub_sysinfo_api/SysInfoApi.h" #include "pub_utility_api/FileStyle.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h index 03dd1173..5803b5c4 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.h @@ -1,4 +1,4 @@ -#ifndef CALARMFILTERDIALOG_H +#ifndef CALARMFILTERDIALOG_H #define CALARMFILTERDIALOG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.ui b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.ui index 697a1be9..a4d7d56e 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.ui +++ b/product/src/gui/plugin/AlarmWidget/CAlarmFilterDialog.ui @@ -6,13 +6,13 @@ 0 0 - 657 - 510 + 1000 + 546 - 530 + 1000 0 diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp index ae7e1c04..283e6f26 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.cpp @@ -1,4 +1,4 @@ -#include "CAlarmForm.h" +#include "CAlarmForm.h" #include #include #include @@ -38,6 +38,7 @@ #include "CAlarmBaseData.h" #include "CAlarmShiledDialog.h" #include "CAccidentReviewDialog.h" +#include "pub_utility_api/FileStyle.h" CAlarmForm::CAlarmForm(QWidget *parent) : QWidget(parent), m_ptrSysInfo(Q_NULLPTR), @@ -63,7 +64,7 @@ CAlarmForm::CAlarmForm(QWidget *parent) : ui->alarmView->setObjectName("alarmView"); ui->splitter->setStretchFactor(0,1); ui->splitter->setStretchFactor(1,6); - + initStyle(); QHBoxLayout * pHBoxLayout = new QHBoxLayout(ui->deviceView->header()); m_pSearchTextEdit = new QLineEdit(ui->deviceView->header()); m_pSearchTextEdit->setObjectName("searchTextEdit"); @@ -132,6 +133,24 @@ CAlarmForm::CAlarmForm(QWidget *parent) : m_thread->start(); } +void CAlarmForm::initStyle(){ + QString qss = QString(); + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarmForm.qss") ; + QFile qssfile2(QString::fromStdString(strFullPath)); + qssfile2.open(QFile::ReadOnly); + if (qssfile2.isOpen()) + { + qss += QLatin1String(qssfile2.readAll()); + qssfile2.close(); + } + if(!qss.isEmpty()) + { + setStyleSheet(qss); + } + +} + + CAlarmForm::~CAlarmForm() { if(m_communicator != Q_NULLPTR) @@ -207,7 +226,7 @@ void CAlarmForm::initialize() //< lingdaoyaoqiu { - QSettings columFlags("KBD_HMI", "alarm config"); + QSettings columFlags("IOT_HMI", "alarm config"); if(!columFlags.contains(QString("alarm/colum_0"))) { columFlags.setValue(QString("alarm/colum_0"), false); //< 时间 @@ -216,8 +235,8 @@ void CAlarmForm::initialize() columFlags.setValue(QString("alarm/colum_3"), true); //< 责任区 columFlags.setValue(QString("alarm/colum_4"), true); //< 告警类型 columFlags.setValue(QString("alarm/colum_5"), false); //< 告警状态 - columFlags.setValue(QString("alarm/colum_6"), false); //< 确认状态 - columFlags.setValue(QString("alarm/colum_7"), false); //< + columFlags.setValue(QString("alarm/colum_6"), true); //< 确认状态 + columFlags.setValue(QString("alarm/colum_7"), true); //< } } ui->comboBox->setModel(m_pListWidget1->model()); @@ -692,7 +711,8 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model,CAiAlarmTreeModel *treeMod connect(ui->alarmView->horizontalHeader(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), m_pModel, SLOT(sortColumn(int,Qt::SortOrder))); connect(ui->aiAlarmTreeView->header(),&QHeaderView::sortIndicatorChanged, m_treeModel,&CAiAlarmTreeModel::sortColumn); - connect(ui->aiAlarmTreeView,&CAiAlarmTreeView::doubleClicked, this,&CAlarmForm::aiAlmDoubleClicked); + //先注释掉，想启用的话可以通过脚本绑定 + //connect(ui->aiAlarmTreeView,&CAiAlarmTreeView::doubleClicked, this,&CAlarmForm::aiAlmDoubleClicked); ui->confirm->setEnabled(true); ui->remove->setEnabled(true); //原始告警窗 @@ -703,7 +723,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model,CAiAlarmTreeModel *treeMod ui->alarmView->setColumnWidth(5, 150); ui->alarmView->setColumnWidth(6, 120); - QSettings columFlags("KBD_HMI", "alarm config"); + QSettings columFlags("IOT_HMI", "alarm config"); for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount() - 1; nColumnIndex++) { bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool(); @@ -761,7 +781,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model) ui->alarmView->setColumnWidth(6, 120); - QSettings columFlags("KBD_HMI", "alarm config"); + QSettings columFlags("IOT_HMI", "alarm config"); for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount() - 1; nColumnIndex++) { bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool(); @@ -774,6 +794,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model) { connect(m_pDeviceModel, &CAlarmDeviceTreeModel::itemCheckStateChanged, this, &CAlarmForm::deviceGroupFilterChanged); connect(m_pDeviceModel, &CAlarmDeviceTreeModel::inhibitDevGroupAlm, this, &CAlarmForm::slotInhibitDevGroupAlm); + connect(CAlarmDataCollect::instance(),&CAlarmDataCollect::sigDevTreeUpdate,m_pDeviceModel,&CAlarmDeviceTreeModel::slotDevTreeUpdate); } initFilter(); } @@ -1337,7 +1358,7 @@ void CAlarmForm::contextMenuStack0Event(QContextMenuEvent *event) connect(action, &QAction::triggered, [=](){ ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked()); - QSettings columFlags("KBD_HMI", "alarm config"); + QSettings columFlags("IOT_HMI", "alarm config"); columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked()); }); } @@ -1460,7 +1481,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event) connect(action, &QAction::triggered, [=](){ ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked()); - QSettings columFlags("KBD_HMI", "alarm config"); + QSettings columFlags("IOT_HMI", "alarm config"); columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked()); }); } @@ -2902,17 +2923,15 @@ void CAlarmForm::inhibitAlm(const AlarmMsgPtr &alm) msg.setSubject(alm->sub_system, CH_HMI_TO_OPT_OPTCMD_DOWN); SOptTagSet sOptTagSet; SOptTagQueue optTagQueue; - COptTagSet cOptTagSet; - if(createReqHead(sOptTagSet.stHead,alm)!= kbdSuccess) + if(createReqHead(sOptTagSet.stHead,alm)!= iotSuccess) { return ; } QString keyIdTag = alm->key_id_tag; if(keyIdTag.endsWith(".value")) { - //禁止告警和实时数据代码一致，要不实时数据 插件取消告警会失败； - // keyIdTag.replace(QString(".value"),QString(".status")); + keyIdTag.replace(QString(".value"),QString(".status")); }else { return ; @@ -2927,7 +2946,7 @@ void CAlarmForm::inhibitAlm(const AlarmMsgPtr &alm) optTagQueue.nSubSystem = alm->sub_system; sOptTagSet.vecTagQueue.push_back(optTagQueue); - std::string content = cOptTagSet.generate(sOptTagSet); + std::string content = COptTagSet::generate(sOptTagSet); msg.setMsgType(MT_OPT_PINHIBIT_ALARM); @@ -2998,7 +3017,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) if(!createSysInfoInstance(m_ptrSysInfo)) { LOGERROR("创建系统信息访问库实例失败!"); - return kbdFailed; + return iotFailed; } } @@ -3014,13 +3033,13 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) if(permMng->PermDllInit() != PERM_NORMAL) { LOGERROR("权限接口初始化失败!"); - return kbdFailed; + return iotFailed; }else { if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName)) { userID = -1; - return kbdFailed; + return iotFailed; } } } @@ -3044,7 +3063,7 @@ int CAlarmForm::createReqHead(SOptReqHead &head, const AlarmMsgPtr &alm) head.nUserGroupID = usergID; head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch(); - return kbdSuccess; + return iotSuccess; } void CAlarmForm::reloadDevTree() diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.h b/product/src/gui/plugin/AlarmWidget/CAlarmForm.h index 46f3c301..363d3552 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.h @@ -1,4 +1,4 @@ -#ifndef CALARMFORM_H +#ifndef CALARMFORM_H #define CALARMFORM_H #include @@ -49,7 +49,7 @@ public: void initialize(); void init(); - + void initStyle(); void setAlarmModel(CAlarmItemModel * model, CAiAlarmTreeModel *treeModel); void setAlarmModel(CAlarmItemModel * model); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui b/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui index bbceb998..ffb64146 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui @@ -40,25 +40,55 @@ 0 - + + + 9 + 0 - + 9 - + 0 - - + + 0 + + + 6 + + + + + + 0 + 0 + + + + + 0 + 40 + + + + + 16777215 + 16777215 + + QFrame::StyledPanel QFrame::Raised - + + + 6 + 0 @@ -66,414 +96,141 @@ 0 - 9 + 0 0 - - 0 - - - - - 6 + + + + 0 + + + 0 - + + + 当前显示数量： + + + + + - 100 + 55 0 - - - 100 - 26 - - - 禁止列表 + 0 - - - - 0 - 0 - + + + 过滤告警数量： + + + + - 45 + 55 0 - - - 45 - 26 - - - 过滤 - - - - - - - - 0 - 0 - - - - - 45 - 0 - - - - - 45 - 26 - - - - 导出 - - - - - - - - 0 - 0 - - - - - 16777215 - 26 - - - - Qt::RightToLeft - - - 优先级: - - - - - - - - 125 - 0 - - - - - 16777215 - 26 - - - - - - - - - 0 - 0 - - - - - 16777215 - 26 - - - - Qt::RightToLeft - - - 位置: - - - - - - - - 113 - 0 - - - - - 16777215 - 26 - - - - - - - - - 0 - 0 - - - - - 16777215 - 26 - - - - Qt::RightToLeft - - - 告警状态: - - - - - - - - 138 - 0 - - - - - 16777215 - 26 - - - - - - - - - 0 - 0 - - - - - 16777215 - 26 - - - - 时间: - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 26 - - - - - - - - 0 - - - 2 - - - 3 - - - - - - 55 - 0 - - - - 0 - - - - - - - 过滤告警数量： - - - - - - - 当前显示数量： - - - - - - - - 55 - 0 - - - - 0 - - - - - - - - - - 80 - 26 - - - - - 16777215 - 26 - - - - 智能告警 - - - true - - - false - - - - - - - Qt::Horizontal - - - - 13 - 20 - - - - - - - - false - - - - 45 - 26 - - - - - - - 确认 - - - - - - - false - - - - 45 - 26 - - - - 删除 - - - - - - - - 45 - 26 - - - - 禁止告警 - - - - - - - - 45 - 26 - - - - 设置 - - - - - - - - 45 - 26 - - - - 关闭 + 0 + + + + true + + + + 80 + 26 + + + + + 1000 + 26 + + + + 智能告警 + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 800 + 20 + + + + + + + + true + + + + 0 + 0 + + + + + 60 + 26 + + + + 设置 + + + + + + + + 60 + 26 + + + + 关闭 + + + - + @@ -503,7 +260,7 @@ - 1 + 0 @@ -522,7 +279,7 @@ 0 - + @@ -578,6 +335,332 @@ + + + + 0 + + + 9 + + + 0 + + + 9 + + + + + + 100 + 0 + + + + + 100 + 26 + + + + 禁止列表 + + + + + + + + 0 + 0 + + + + + 16777215 + 26 + + + + Qt::RightToLeft + + + 优先级: + + + + + + + + 0 + 0 + + + + + 16777215 + 26 + + + + Qt::RightToLeft + + + 位置: + + + + + + + + 0 + 0 + + + + + 65 + 0 + + + + + 65 + 26 + + + + 过滤 + + + + + + + + 0 + 0 + + + + + 65 + 0 + + + + + 65 + 26 + + + + 导出 + + + + + + + false + + + + 65 + 26 + + + + 删除 + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + + 1000 + 26 + + + + + + + + + 0 + 0 + + + + + 150 + 26 + + + + + 1000 + 26 + + + + + + + + + 45 + 26 + + + + 禁止告警 + + + + + + + false + + + + 65 + 26 + + + + + + + 确认 + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 200 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 26 + + + + 时间: + + + + + + + + 0 + 0 + + + + + 16777215 + 26 + + + + Qt::RightToLeft + + + 告警状态: + + + + + + + + 0 + 0 + + + + + 150 + 26 + + + + + + + + + 250 + 0 + + + + + 16777215 + 26 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp index be4a878f..ccab6960 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.cpp @@ -1,4 +1,4 @@ -#include "CAlarmInhibitDialog.h" +#include "CAlarmInhibitDialog.h" #include "ui_CAlarmInhibitDialog.h" #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.h b/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.h index 764ffd42..f79c84ea 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmInhibitDialog.h @@ -1,4 +1,4 @@ -#ifndef CALARMINHIBITDIALOG_H +#ifndef CALARMINHIBITDIALOG_H #define CALARMINHIBITDIALOG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp index 856daaf9..18481f86 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.cpp @@ -1,4 +1,4 @@ -#include "CAlarmItemModel.h" +#include "CAlarmItemModel.h" #include "CAlarmMsgInfo.h" #include #include @@ -8,7 +8,19 @@ #include "CAlarmMsgManage.h" #include "perm_mng_api/PermMngApi.h" #include + +//< 屏蔽xml_parser编译告警 +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#endif + #include "boost/property_tree/xml_parser.hpp" + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #include "boost/typeof/typeof.hpp" #include "boost/filesystem.hpp" #include "Common.h" @@ -351,11 +363,11 @@ void CAlarmItemModel::sortColumn(int column, Qt::SortOrder order) { if(order == Qt::AscendingOrder) { - m_order = Qt::DescendingOrder; + m_order = Qt::AscendingOrder; } else { - m_order = Qt::AscendingOrder; + m_order = Qt::DescendingOrder; } m_sortKey = (E_ALARM_SORTKEY)column; beginResetModel(); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.h b/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.h index 94f6ffa0..846f482b 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmItemModel.h @@ -1,4 +1,4 @@ -#ifndef CALARMITEMMODEL_H +#ifndef CALARMITEMMODEL_H #define CALARMITEMMODEL_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp index 9712bc7a..49196297 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.cpp @@ -1,4 +1,4 @@ - + #ifdef OS_WINDOWS //< 为了检测可用声卡 #include @@ -16,11 +16,6 @@ #include "CAlarmSetMng.h" #include "service/alarm_server_api/AlarmCommonDef.h" #include "CAlarmMsgManage.h" -#include -#include -#include -#include -#include using namespace iot_public; CAlarmMediaPlayer * CAlarmMediaPlayer::m_pInstance = NULL; @@ -183,40 +178,6 @@ void CAlarmMediaPlayer::initSpeech() } } } - //添加语音转文本处理条件 - QFile file(iot_public::CFileUtil::getPathOfCfgFile("alarmSpeechTextTrans.xml" , CN_DIR_PRODUCT).c_str()); - if (!file.open(QFile::ReadWrite)) - { - LOGERROR("打开语音文本转换文件失败,默认不进行语音转换"); - return; - } - - QDomDocument doc; - if (!doc.setContent(&file)) - { - file.close(); - LOGERROR("打开语音文本转换文件失败,默认不进行语音转换"); - return; - } - file.close(); - - QDomElement root = doc.documentElement(); - if(root.isElement()) - { - QDomNodeList nodeList = root.childNodes(); - for(int i = 0 ; i < nodeList.count() ; i++) - { - QDomNode node = nodeList.at(i); - if(node.isElement()) - { - QDomElement element = node.toElement(); - if(element.tagName() == "Condition" && element.attribute("enable") == "true") - { - m_mapSpeechTxtTrans.insert(element.attribute("key"),element.attribute("value")); - } - } - } - } } @@ -263,17 +224,6 @@ void CAlarmMediaPlayer::insertAudioCuesStop(const AlarmMsgPtr &info) } } -void CAlarmMediaPlayer::speechTextTrans(QString &strContent) -{ -// strContent = "110KV回路503弹簧开关10A保护A线"; - //文本转换处理 - auto iter = m_mapSpeechTxtTrans.begin(); - for(;iter != m_mapSpeechTxtTrans.end() ; iter++) - { - strContent.replace(QRegExp(iter.key() , Qt::CaseInsensitive) , iter.value()); - } -} - void CAlarmMediaPlayer::setVolumeEnable(bool bEnable) { if(bEnable) @@ -467,8 +417,6 @@ void CAlarmMediaPlayer::updateAudioCuesSpeech() if(!alarmContent.isEmpty()) { - //读取配置文件，更改读取方式 - speechTextTrans(alarmContent); m_pTextToSpeech->say(alarmContent); } } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.h b/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.h index e8de5d58..84e9dce5 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMediaPlayer.h @@ -1,4 +1,4 @@ -#ifndef CALARMMEDIAPLAYER_H +#ifndef CALARMMEDIAPLAYER_H #define CALARMMEDIAPLAYER_H #include @@ -53,8 +53,6 @@ private: void insertAudioCuesStop(const AlarmMsgPtr &info); - void speechTextTrans(QString &strContent);//读取配置文件，调整文本语音输出 - private slots: /** * @brief playerStateChanged 播放器状态变化 @@ -92,7 +90,6 @@ private: QString m_engine; QString m_language; QString m_voiceName; - QMap m_mapSpeechTxtTrans; bool m_readFlag; diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp index b8a1352e..ec65ae81 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.cpp @@ -1,4 +1,4 @@ -#include "CAlarmMsgInfo.h" +#include "CAlarmMsgInfo.h" #include #include "CAlarmDataCollect.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h index 7be0efd9..f8b286fd 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgInfo.h @@ -1,4 +1,4 @@ -#ifndef ALARMMSGINFO_H +#ifndef ALARMMSGINFO_H #define ALARMMSGINFO_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp index 210a087e..a58ff0bc 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.cpp @@ -1,4 +1,4 @@ -#include "CAlarmMsgManage.h" +#include "CAlarmMsgManage.h" #include #include #include @@ -8,7 +8,18 @@ #include #include "perm_mng_api/PermMngApi.h" +//< 屏蔽xml_parser编译告警 +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#endif + #include "boost/property_tree/xml_parser.hpp" + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #include "boost/typeof/typeof.hpp" #include "boost/filesystem.hpp" #include "Common.h" @@ -201,12 +212,18 @@ void CAlarmMsgManage::updataDevGroupByDev(QString devGroup, QString device) } } -QHash > > CAlarmMsgManage::getLocNotConfirmAlmInfo() +const QHash > > &CAlarmMsgManage::getLocNotConfirmAlmInfo() const { QMutexLocker locker(mutex); return m_alarmLNCAlm; } +const QHash > > &CAlarmMsgManage::getLocPriorityNotConfirmAlmInfo() const +{ + QMutexLocker locker(mutex); + return m_alarmLNCPAlm; +} + void CAlarmMsgManage::getAllInhibitAlm(QList &almList) { QMutexLocker locker(mutex); @@ -929,42 +946,80 @@ void CAlarmMsgManage::locSubStats(const AlarmMsgPtr &msg) } } -void CAlarmMsgManage::addNotConfirmAlm(int locId, const QString &devg, const QString &uuid) +void CAlarmMsgManage::addNotConfirmAlm(const AlarmMsgPtr &msg) { - QHash > >::iterator it =m_alarmLNCAlm.find(locId); + //< 按设备组 + QHash > >::iterator it =m_alarmLNCAlm.find(msg->location_id); if(it != m_alarmLNCAlm.end()) { QMap > &devgMap = it.value(); - QMap >::iterator pos = devgMap.find(devg); + QMap >::iterator pos = devgMap.find(msg->dev_group_tag); if(pos != devgMap.end()) { - pos.value().insert(uuid); + pos.value().insert(msg->uuid_base64); }else { QSet uuidSet; - uuidSet.insert(uuid); - devgMap[devg] = uuidSet; + uuidSet.insert(msg->uuid_base64); + devgMap[msg->dev_group_tag] = uuidSet; } }else { QMap > devgMap; QSet uuidSet; - uuidSet.insert(uuid); - devgMap[devg] = uuidSet; - m_alarmLNCAlm[locId] = devgMap; + uuidSet.insert(msg->uuid_base64); + devgMap[msg->dev_group_tag] = uuidSet; + m_alarmLNCAlm[msg->location_id] = devgMap; + } + + //< 按告警等级 + QHash > >::iterator pIt =m_alarmLNCPAlm.find(msg->location_id); + if(pIt != m_alarmLNCPAlm.end()) + { + QMap > &pMap = pIt.value(); + QMap >::iterator pos = pMap.find(msg->priority); + if(pos != pMap.end()) + { + pos.value().insert(msg->uuid_base64); + }else + { + QSet uuidSet; + uuidSet.insert(msg->uuid_base64); + pMap[msg->priority] = uuidSet; + } + }else + { + QMap > pMap; + QSet uuidSet; + uuidSet.insert(msg->uuid_base64); + pMap[msg->priority] = uuidSet; + m_alarmLNCPAlm[msg->location_id] = pMap; } } -void CAlarmMsgManage::delNotConfirmAlm(int locId, const QString &devg, const QString &uuid) +void CAlarmMsgManage::delNotConfirmAlm(const AlarmMsgPtr &msg) { - QHash > >::iterator it =m_alarmLNCAlm.find(locId); + //< 按设备组 + QHash > >::iterator it =m_alarmLNCAlm.find(msg->location_id); if(it != m_alarmLNCAlm.end()) { QMap > &devgMap = it.value(); - QMap >::iterator pos = devgMap.find(devg); + QMap >::iterator pos = devgMap.find(msg->dev_group_tag); if(pos != devgMap.end()) { - pos.value().remove(uuid); + pos.value().remove(msg->uuid_base64); + } + } + + //< 按告警等级 + QHash > >::iterator pIt =m_alarmLNCPAlm.find(msg->location_id); + if(pIt != m_alarmLNCPAlm.end()) + { + QMap > &pMap = pIt.value(); + QMap >::iterator pos = pMap.find(msg->priority); + if(pos != pMap.end()) + { + pos.value().remove(msg->uuid_base64); } } } @@ -1080,7 +1135,7 @@ void CAlarmMsgManage::initAlarm() if(E_ALS_ALARM == (*itpos)->logic_state || E_ALS_RETURN == (*itpos)->logic_state )//未确认数量(界面显示未确认) { - addNotConfirmAlm((*itpos)->location_id,(*itpos)->dev_group_tag,(*itpos)->uuid_base64); + addNotConfirmAlm(*itpos); ++m_nNDelComAlarmCount; } updateMsgAction((*itpos)); @@ -1314,7 +1369,7 @@ void CAlarmMsgManage::addAlarmMsg(const QList &msgList) } if(E_ALS_ALARM == (*itpos)->logic_state || E_ALS_RETURN == (*itpos)->logic_state )//未确认数量(界面显示未确认) { - addNotConfirmAlm((*itpos)->location_id,(*itpos)->dev_group_tag,(*itpos)->uuid_base64); + addNotConfirmAlm(*itpos); ++m_nNDelComAlarmCount; } updateMsgAction(*itpos); @@ -1390,7 +1445,7 @@ void CAlarmMsgManage::confirmAlarmMsg(const QList &uuidList) oldMsg->logic_state = E_ALS_RETURN_CFM; --m_nNDelComAlarmCount; } - delNotConfirmAlm(oldMsg->location_id,oldMsg->dev_group_tag,oldMsg->uuid_base64); + delNotConfirmAlm(oldMsg); }else { AlarmMsgPtr oldMsg_ = m_all.value(uuid, NULL); @@ -1447,7 +1502,7 @@ int CAlarmMsgManage::removeAlarmMsg(const QList &uuidList) } if(E_ALS_ALARM == oldMsg->logic_state) { - delNotConfirmAlm(oldMsg->location_id,oldMsg->dev_group_tag,oldMsg->uuid_base64); + delNotConfirmAlm(oldMsg); --m_nNDelComAlarmCount; oldMsg->logic_state = E_ALS_ALARM_DEL; } @@ -1457,7 +1512,7 @@ int CAlarmMsgManage::removeAlarmMsg(const QList &uuidList) } else if(E_ALS_RETURN == oldMsg->logic_state) { - delNotConfirmAlm(oldMsg->location_id,oldMsg->dev_group_tag,oldMsg->uuid_base64); + delNotConfirmAlm(oldMsg); --m_nNDelComAlarmCount; oldMsg->logic_state = E_ALS_RETURN_DEL; } @@ -1574,7 +1629,7 @@ void CAlarmMsgManage::removeAlarmMsgByDomainID(const int &domainId) { if(E_ALS_ALARM == (*it)->logic_state || E_ALS_RETURN == (*it)->logic_state) { - delNotConfirmAlm((*it)->location_id,(*it)->dev_group_tag,(*it)->uuid_base64); + delNotConfirmAlm(*it); --m_nNDelComAlarmCount; } removeAudioCues(it.value()); @@ -1788,7 +1843,7 @@ void CAlarmMsgManage::msgArrived() if(E_ALS_ALARM == m_listMsgAddCache.at(num)->logic_state || E_ALS_RETURN == m_listMsgAddCache.at(num)->logic_state )//未删除未确认数量(界面显示未确认) { - addNotConfirmAlm(m_listMsgAddCache.at(num)->location_id,m_listMsgAddCache.at(num)->dev_group_tag,m_listMsgAddCache.at(num)->uuid_base64); + addNotConfirmAlm(m_listMsgAddCache.at(num)); ++m_nNDelComAlarmCount; } updateMsgAction(m_listMsgAddCache.at(num)); diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h index 281e016a..16e198ed 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmMsgManage.h @@ -1,4 +1,4 @@ -#ifndef CALARMMSGMANAGE_H +#ifndef CALARMMSGMANAGE_H #define CALARMMSGMANAGE_H #include @@ -79,7 +79,8 @@ public: QHash > getLocAlmInfo(); void updataDevGroupByDev(QString devGroup, QString device); - QHash > > getLocNotConfirmAlmInfo(); + const QHash > > &getLocNotConfirmAlmInfo() const; + const QHash > > &getLocPriorityNotConfirmAlmInfo() const; void getAllInhibitAlm(QList &almList); signals: @@ -267,18 +268,14 @@ private: void locSubStats(const AlarmMsgPtr &msg); /** * @brief addNotConfirmAlm 添加未确认的告警uuid - * @param locId - * @param devg - * @param uuid + * @param msg */ - void addNotConfirmAlm(int locId,const QString &devg,const QString &uuid); + void addNotConfirmAlm(const AlarmMsgPtr &msg); /** * @brief delNotConfirmAlm 从未确认的告警uuid集合中删除（删除的不一定被确认 可能是数据重发） - * @param locId - * @param devg - * @param uuid + * @param msg */ - void delNotConfirmAlm(int locId,const QString &devg,const QString &uuid); + void delNotConfirmAlm(const AlarmMsgPtr &msg); signals: /** * @brief sigAiMsgRemove 通知智能告警模型删除智能告警 @@ -406,6 +403,7 @@ private: QHash > m_alarmLPAlm; //< <车站id,<告警等级,告警数量> > QHash > > m_alarmLNCAlm;//< <车站id,<设备组,<未确认告警uuid> > > + QHash > > m_alarmLNCPAlm;//< <车站id,<告警等级,<未确认告警uuid> > > QList m_delaydeal; //延迟处理的智能告警 diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp index 8327995e..ec6cf4cd 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.cpp @@ -1,4 +1,4 @@ -#include "CAlarmPlugin.h" +#include "CAlarmPlugin.h" #include #include #include @@ -693,13 +693,13 @@ int CAlarmPlugin::getLocNotConfirmAlmCount(int loc) { return count; } - QHash > > locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo(); + const QHash > > &locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo(); - QHash > >::iterator it = locCountMap.find(loc); + QHash > >::const_iterator it = locCountMap.find(loc); if(it !=locCountMap.end()) { QMap > devgCountMap = it.value(); - QMap >::iterator pos = devgCountMap.begin(); + QMap >::const_iterator pos = devgCountMap.begin(); while (pos != devgCountMap.end()) { count += pos.value().count(); @@ -710,6 +710,28 @@ int CAlarmPlugin::getLocNotConfirmAlmCount(int loc) return count; } +QStringList CAlarmPlugin::getLocNotConfirmAlmInfo(int loc) +{ + QStringList result; + result.clear(); + if(loc < 0){ + return result; + } + const QHash > > &locCountMap = CAlarmMsgManage::instance()->getLocPriorityNotConfirmAlmInfo(); + QHash > >::const_iterator it = locCountMap.find(loc); + if(it != locCountMap.end()) + { + const QMap > &pMap = it.value(); + QMap >::const_iterator pos = pMap.constBegin(); + while (pos != pMap.constEnd()) + { + result.append( QString("%1_%2").arg(pos.key()).arg(pos.value().count()) ); + pos++; + } + } + return result; +} + int CAlarmPlugin::getDevgNotConfirmAlmCount(const QString &devg) { int count =0; @@ -717,13 +739,13 @@ int CAlarmPlugin::getDevgNotConfirmAlmCount(const QString &devg) { return count; } - QHash > > locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo(); + const QHash > > &locCountMap = CAlarmMsgManage::instance()->getLocNotConfirmAlmInfo(); - QHash > >::iterator it = locCountMap.begin(); + QHash > >::const_iterator it = locCountMap.begin(); while (it !=locCountMap.end()) { QMap > devgCountMap = it.value(); - QMap >::iterator pos = devgCountMap.find(devg); + QMap >::const_iterator pos = devgCountMap.find(devg); if(pos != devgCountMap.end()) { count = pos.value().count(); @@ -903,6 +925,18 @@ void CAlarmPlugin::setDeviceGroup(const QString &deviceGroup) } + +void CAlarmPlugin::setPriorityFilter(int PriorityFilter) +{ + bool isCheck = true; + QList priorityList; + priorityList.append(PriorityFilter); + if(m_pModel) + { + m_pModel->setPriorityFilter(isCheck,priorityList); + } +} + void CAlarmPlugin::setPointTag(const QString &pointList) { if(m_bIsEditMode || E_Alarm_Pop != m_mode) diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.h b/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.h index e4efa550..caa54371 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmPlugin.h @@ -1,4 +1,4 @@ -#ifndef CALARMPLUGIN_H +#ifndef CALARMPLUGIN_H #define CALARMPLUGIN_H #include @@ -102,6 +102,12 @@ public slots: * @return 未确认告警条数 */ int getLocNotConfirmAlmCount(int loc); + /** + * @brief getLocNotConfirmAlmInfo 获取车站未确认告警数量（优先级分组） + * @param loc 位置id + * @return QString 格式为： 告警等级_告警数量 ex:1_23 含义为 告警等级为1的告警数量为23 + */ + QStringList getLocNotConfirmAlmInfo(int loc); /** * @brief getDevgNotConfirmAlmCount 获取设备组的未确认告警条数 * @param devg 设备组 @@ -207,11 +213,20 @@ public slots: * @param device 设备 */ void setDevice(const QString &device); + + /** * @brief setDeviceGroup 设置设备组显示 * @param deviceGroup 设备组 */ void setDeviceGroup(const QString &deviceGroup); + + /** + * @brief setPriorityFilter 设置优先级 + * @param deviceGroup 优先级 + */ + void setPriorityFilter(int PriorityFilter); + /** * @brief setPointTag 设置点过滤(已无效，保留只为兼容) * @param pointList 点集合 diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.cpp index 5337d7e3..d16db7e0 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CAlarmPluginWidget.h" #include "CAlarmPlugin.h" #include "pub_logger_api/logger.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.h b/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.h index 5c706ea9..95196608 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CALARMPLUGINWIDGET_H +#ifndef CALARMPLUGINWIDGET_H #define CALARMPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CAlarmPluginWidget : 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/AlarmWidget/CAlarmSetDlg.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp index 8cbe1a34..4c9675e2 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.cpp @@ -1,4 +1,4 @@ -#include "CAlarmSetDlg.h" +#include "CAlarmSetDlg.h" #include "ui_CAlarmSetDlg.h" #include #include "pub_utility_api/FileUtil.h" diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.h b/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.h index cf8da490..0d043a34 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetDlg.h @@ -1,4 +1,4 @@ -#ifndef CALARMSETDLG_H +#ifndef CALARMSETDLG_H #define CALARMSETDLG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp index 4e76ee52..2d3d464b 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.cpp @@ -1,4 +1,4 @@ -#include "CAlarmSetMng.h" +#include "CAlarmSetMng.h" #include #include "pub_logger_api/logger.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h index 41c78362..c5f33a8c 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmSetMng.h @@ -1,4 +1,4 @@ -#ifndef CALARMSETMNG_H +#ifndef CALARMSETMNG_H #define CALARMSETMNG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp index 78556db5..9c6e8ad9 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmShiledDialog.cpp @@ -1,4 +1,4 @@ -#include "CAlarmShiledDialog.h" +#include "CAlarmShiledDialog.h" #include "ui_CAlarmShiledDialog.h" #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.cpp index c2d58414..24f64284 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.cpp @@ -1,4 +1,4 @@ -#include "CAlarmTaskMngDlg.h" +#include "CAlarmTaskMngDlg.h" #include "ui_CAlarmTaskMngDlg.h" #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.h b/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.h index ef38a280..24fe3b5e 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmTaskMngDlg.h @@ -1,4 +1,4 @@ -#ifndef CALARMTASKMNGDLG_H +#ifndef CALARMTASKMNGDLG_H #define CALARMTASKMNGDLG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp index 9968b060..422e6d91 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "CAlarmView.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmView.h b/product/src/gui/plugin/AlarmWidget/CAlarmView.h index d2adb96d..a9ec519d 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmView.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmView.h @@ -1,4 +1,4 @@ -#ifndef CALARMVIEW_H +#ifndef CALARMVIEW_H #define CALARMVIEW_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp index 118c0d8e..af6644a4 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp @@ -1,4 +1,4 @@ -#include "CAlarmWidget.h" +#include "CAlarmWidget.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h index da4d8f4a..bd50b909 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h @@ -1,4 +1,4 @@ -#ifndef CALARMWINDOW_H +#ifndef CALARMWINDOW_H #define CALARMWINDOW_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.cpp b/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.cpp index cc76816e..59ade39c 100644 --- a/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.cpp +++ b/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.cpp @@ -1,4 +1,4 @@ -#include "CDisposalPlanDialog.h" +#include "CDisposalPlanDialog.h" #include "ui_CDisposalPlanDialog.h" #include "CAiAlarmMsgInfo.h" #include diff --git a/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.h b/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.h index 3dccca2c..f2735e4f 100644 --- a/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.h +++ b/product/src/gui/plugin/AlarmWidget/CDisposalPlanDialog.h @@ -1,4 +1,4 @@ -#ifndef CDISPOSALPLANDIALOG_H +#ifndef CDISPOSALPLANDIALOG_H #define CDISPOSALPLANDIALOG_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CMyCalendar.cpp b/product/src/gui/plugin/AlarmWidget/CMyCalendar.cpp index 9dca56ae..9c72e0d7 100644 --- a/product/src/gui/plugin/AlarmWidget/CMyCalendar.cpp +++ b/product/src/gui/plugin/AlarmWidget/CMyCalendar.cpp @@ -1,4 +1,4 @@ -#include "CMyCalendar.h" +#include "CMyCalendar.h" #include "ui_CMyCalendar.h" #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CMyCalendar.h b/product/src/gui/plugin/AlarmWidget/CMyCalendar.h index 339fb73c..caa34e37 100644 --- a/product/src/gui/plugin/AlarmWidget/CMyCalendar.h +++ b/product/src/gui/plugin/AlarmWidget/CMyCalendar.h @@ -1,4 +1,4 @@ -#ifndef CMYCALENDAR_H +#ifndef CMYCALENDAR_H #define CMYCALENDAR_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CMyCheckBox.cpp b/product/src/gui/plugin/AlarmWidget/CMyCheckBox.cpp index c30c3224..0eb5dbda 100644 --- a/product/src/gui/plugin/AlarmWidget/CMyCheckBox.cpp +++ b/product/src/gui/plugin/AlarmWidget/CMyCheckBox.cpp @@ -1,4 +1,4 @@ -#include "CMyCheckBox.h" +#include "CMyCheckBox.h" #include CMyCheckBox::CMyCheckBox(QString text, QWidget *parent) diff --git a/product/src/gui/plugin/AlarmWidget/CMyCheckBox.h b/product/src/gui/plugin/AlarmWidget/CMyCheckBox.h index bdba8dbc..1dad82e3 100644 --- a/product/src/gui/plugin/AlarmWidget/CMyCheckBox.h +++ b/product/src/gui/plugin/AlarmWidget/CMyCheckBox.h @@ -1,4 +1,4 @@ -#ifndef MYCHECKBOX_H +#ifndef MYCHECKBOX_H #define MYCHECKBOX_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CMyListWidget.cpp b/product/src/gui/plugin/AlarmWidget/CMyListWidget.cpp index ded92615..fa73a493 100644 --- a/product/src/gui/plugin/AlarmWidget/CMyListWidget.cpp +++ b/product/src/gui/plugin/AlarmWidget/CMyListWidget.cpp @@ -1,4 +1,4 @@ -#include "CMyListWidget.h" +#include "CMyListWidget.h" CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent) { diff --git a/product/src/gui/plugin/AlarmWidget/CMyListWidget.h b/product/src/gui/plugin/AlarmWidget/CMyListWidget.h index 3e92461e..728f308d 100644 --- a/product/src/gui/plugin/AlarmWidget/CMyListWidget.h +++ b/product/src/gui/plugin/AlarmWidget/CMyListWidget.h @@ -1,4 +1,4 @@ -#ifndef CMYLISTWIDGET_H +#ifndef CMYLISTWIDGET_H #define CMYLISTWIDGET_H #include diff --git a/product/src/gui/plugin/AlarmWidget/CPdfPrinter.cpp b/product/src/gui/plugin/AlarmWidget/CPdfPrinter.cpp index f11342f0..743397b6 100644 --- a/product/src/gui/plugin/AlarmWidget/CPdfPrinter.cpp +++ b/product/src/gui/plugin/AlarmWidget/CPdfPrinter.cpp @@ -1,4 +1,4 @@ -#include "CPdfPrinter.h" +#include "CPdfPrinter.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmWidget/CPdfPrinter.h b/product/src/gui/plugin/AlarmWidget/CPdfPrinter.h index 297f96b1..a56faa5e 100644 --- a/product/src/gui/plugin/AlarmWidget/CPdfPrinter.h +++ b/product/src/gui/plugin/AlarmWidget/CPdfPrinter.h @@ -1,4 +1,4 @@ -/** +/** * @file AlarmWidget 之前是做pdf打印，因需求修改，现在改为excel ，但是类名不变，维护请注意 * @brief * @author jxd diff --git a/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.cpp b/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.cpp index ae316e25..9cd41cc1 100644 --- a/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.cpp +++ b/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.cpp @@ -1,4 +1,4 @@ -#include "CTableViewPrinter.h" +#include "CTableViewPrinter.h" #include "CAlarmCommon.h" #include "CAlarmBaseData.h" CTableViewPrinter::CTableViewPrinter(CAlarmItemModel *model): diff --git a/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.h b/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.h index b911e7a8..09e78694 100644 --- a/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.h +++ b/product/src/gui/plugin/AlarmWidget/CTableViewPrinter.h @@ -1,4 +1,4 @@ -#ifndef CTABLEVIEWPRINTER_H +#ifndef CTABLEVIEWPRINTER_H #define CTABLEVIEWPRINTER_H #include "CAlarmItemModel.h" class QVariant; diff --git a/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.cpp b/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.cpp index 673ee6af..ae54c404 100644 --- a/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.cpp +++ b/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.cpp @@ -1,4 +1,4 @@ -#include "CTreeViewPrinter.h" +#include "CTreeViewPrinter.h" #include "CAiAlarmTreeItem.h" CTreeViewPrinter::CTreeViewPrinter(CAiAlarmTreeModel *model): m_pModel(model) diff --git a/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.h b/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.h index a28a4498..d5745648 100644 --- a/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.h +++ b/product/src/gui/plugin/AlarmWidget/CTreeViewPrinter.h @@ -1,4 +1,4 @@ -#ifndef CTREEVIEWPRINTER_H +#ifndef CTREEVIEWPRINTER_H #define CTREEVIEWPRINTER_H #include "CAiAlarmTreeModel.h" class QVariant; diff --git a/product/src/gui/plugin/AlarmWidget/main.cpp b/product/src/gui/plugin/AlarmWidget/main.cpp index 8012dc9f..10043517 100644 --- a/product/src/gui/plugin/AlarmWidget/main.cpp +++ b/product/src/gui/plugin/AlarmWidget/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CAlarmPlugin.h" #include "pub_logger_api/logger.h" #include "net_msg_bus_api/MsgBusApi.h" @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) //<初始化消息总线 QStringList arguments=QCoreApplication::arguments(); std::string name="admin"; - std::string password ="kbdct"; + std::string password ="admin"; int group =1; for(int index(0);index