From 89bcc7791c48d8bcf8e124e56849e44563f8097c Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 23 十二月 2024 18:34:18 +0800
Subject: [PATCH] 1.对话框基类加载资源库、卸载资源库 2. 报警模块的界面添加分页功能
---
SourceCode/Bond/BondEq/CPageAlarm.cpp | 137 +++++++++++++++++++++++++++++++++------------
1 files changed, 99 insertions(+), 38 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPageAlarm.cpp b/SourceCode/Bond/BondEq/CPageAlarm.cpp
index d84faef..f414c24 100644
--- a/SourceCode/Bond/BondEq/CPageAlarm.cpp
+++ b/SourceCode/Bond/BondEq/CPageAlarm.cpp
@@ -8,6 +8,7 @@
#include "Common.h"
#include "ToolUnits.h"
+#define PAGE_SIZE 20
// CPageAlarm 对话框
@@ -19,6 +20,9 @@
m_crBkgnd = PAGE_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
m_pObserver = nullptr;
+ m_nCurPage = 0;
+ m_nTotalPages = 0;
+ m_nDateTimeFlag = 0;
}
CPageAlarm::~CPageAlarm()
@@ -27,6 +31,8 @@
void CPageAlarm::DoDataExchange(CDataExchange* pDX)
{
+ DDX_Control(pDX, IDC_DATETIMEPICKER_START, m_dateTimeStart);
+ DDX_Control(pDX, IDC_DATETIMEPICKER_END, m_dateTimeEnd);
CDialogEx::DoDataExchange(pDX);
}
@@ -35,6 +41,8 @@
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
ON_WM_SIZE()
+ ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CPageAlarm::OnBnClickedButtonPrevPage)
+ ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CPageAlarm::OnBnClickedButtonNextPage)
END_MESSAGE_MAP()
@@ -150,47 +158,30 @@
GetClientRect(&rcClient);
pItem = GetDlgItem(IDC_LIST_ALARM);
- pItem->MoveWindow(12, 12, rcClient.Width() - 24, rcClient.Height() - 24);
+ pItem->MoveWindow(12, 52, rcClient.Width() - 24, rcClient.Height() - 64);
}
void CPageAlarm::LoadAlarms()
{
- CAlarmMonitor* pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
+ CAlarmMonitor* pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
+ // 当前正在发生的报警
pMonitor->Lock();
-
-#if 0
std::map<int, CAlarm*>& alarmings = pMonitor->getAlarmingMap();
- std::list< CAlarm*>& alarms = pMonitor->getAlarmRecords();
-
for (auto item : alarmings) {
AddAlarm(pMonitor, item.second);
}
- for (auto item : alarms) {
- AddAlarm(pMonitor, item);
- }
-#else
- // 获取报警数据
- auto vecData = AlarmManager::getInstance().getAllAlarms();
-
- // 填充数据
- CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
- for (auto item : vecData) {
- pListCtrl->InsertItem(0, _T(""));
- pListCtrl->SetItemText(0, 1, item[0].c_str());
- pListCtrl->SetItemText(0, 2, item[1].c_str());
- pListCtrl->SetItemText(0, 3, item[2].c_str());
- pListCtrl->SetItemText(0, 4, item[3].c_str());
- }
-#endif // 0
-
pMonitor->Unlock();
+
+ // 刷新历史报警数据
+ m_nCurPage = 1;
+ UpdatePageData();
}
void CPageAlarm::AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
{
if (pMonitor == nullptr) {
- pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
+ pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
}
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
pListCtrl->InsertItem(0, _T(""));
@@ -202,32 +193,88 @@
if (pAlarm->getOffTime() > 0) {
pListCtrl->SetItemText(0, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}
-
- AlarmManager::getInstance().addAlarm(
- std::to_string(pAlarm->getId()).c_str(),
- pMonitor->getAlarmText(pAlarm->getId()),
- CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
- CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}
void CPageAlarm::UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
{
if (pMonitor == nullptr) {
- pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
+ pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
}
CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
for (int i = 0; i < pListCtrl->GetItemCount(); i++) {
if (pListCtrl->GetItemData(i) == (DWORD_PTR)pAlarm) {
if (pAlarm->getOffTime() > 0) {
pListCtrl->SetItemText(i, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
-
- AlarmManager::getInstance().updateAlarmEndTime(
- std::to_string(pAlarm->getId()).c_str(),
- pMonitor->getAlarmText(pAlarm->getId()),
- CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
- CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
}
}
+ }
+}
+
+void CPageAlarm::UpdatePageData()
+{
+ // 计算总页数
+ int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", "");
+ m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
+
+ std::vector<std::vector<std::string>> vecData;
+
+ // 根据时间过滤条件加载数据
+ if (m_nDateTimeFlag == 0) {
+ vecData = AlarmManager::getInstance().getAlarms((m_nCurPage - 1) * PAGE_SIZE, PAGE_SIZE);
+ }
+ else {
+ COleDateTime startTime, endTime;
+ m_dateTimeStart.GetTime(startTime);
+ m_dateTimeEnd.GetTime(endTime);
+ CString strStartTime = startTime.Format(_T("%Y-%m-%d %H:%M:%S"));
+ CString strEndTime = endTime.Format(_T("%Y-%m-%d %H:%M:%S"));
+
+ std::string start = CT2A(strStartTime);
+ std::string end = CT2A(strEndTime);
+
+ vecData = AlarmManager::getInstance().getFilteredAlarms("", start, end, m_nCurPage, PAGE_SIZE);
+ }
+
+ if (vecData.empty()) return;
+
+ // 填充数据到控件
+ CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
+ FillDataToListCtrl(pListCtrl, vecData);
+
+ // 更新分页控件（页数和按钮）
+ UpdatePageControls();
+}
+
+void CPageAlarm::UpdatePageControls()
+{
+ // 更新分页信息
+ CString strPage;
+ strPage.Format(_T("第 %d 页"), m_nCurPage);
+ SetDlgItemText(IDC_LABEL_PAGE_NUMBER, strPage);
+
+ // 启用/禁用翻页按钮
+ GetDlgItem(IDC_BUTTON_PREV_PAGE)->EnableWindow(m_nCurPage > 1);
+ GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
+}
+
+void CPageAlarm::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<std::vector<std::string>>& vecData)
+{
+ // 清空当前CListCtrl中的所有项
+ for (int i = 0; i < pListCtrl->GetItemCount(); i++) {
+ CAlarm* pAlarm = (CAlarm*)pListCtrl->GetItemData(i);
+ if (pAlarm != nullptr) {
+ pAlarm->release();
+ }
+ }
+ pListCtrl->DeleteAllItems();
+
+ // 遍历数据并插入到CListCtrl中
+ for (const auto& item : vecData) {
+ int nItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T("")); // 插入新行
+ pListCtrl->SetItemText(nItem, 1, item[0].c_str()); // 设置第一列的文本
+ pListCtrl->SetItemText(nItem, 2, item[1].c_str()); // 设置第二列的文本
+ pListCtrl->SetItemText(nItem, 3, item[2].c_str()); // 设置第三列的文本
+ pListCtrl->SetItemText(nItem, 4, item[3].c_str()); // 设置第四列的文本
}
}
@@ -243,3 +290,17 @@
return CDialogEx::DestroyWindow();
}
+
+void CPageAlarm::OnBnClickedButtonPrevPage()
+{
+ // 点击上一页
+ m_nCurPage--;
+ UpdatePageData(); // 调用分页更新函数
+}
+
+void CPageAlarm::OnBnClickedButtonNextPage()
+{
+ // 点击下一页
+ m_nCurPage++;
+ UpdatePageData(); // 调用分页更新函数
+}
\ No newline at end of file
--
Gitblit v1.9.3