From 31aa10eaae103c30e02d7dc6c71ff4e50de361b3 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 12 五月 2025 15:28:32 +0800
Subject: [PATCH] 1. 修改报警的显示模式（包括日志，需要后期修复） 2. 添加Release模式编译

---
 SourceCode/Bond/Servo/AlarmDlg.cpp |  212 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 122 insertions(+), 90 deletions(-)

diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 4da1912..3ca1d9c 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -6,8 +6,10 @@
 #include "afxdialogex.h"
 #include "AlarmDlg.h"
 #include "AlarmManager.h"
+#include "Common.h"
+#include <iomanip>
 
-#define PAGE_SIZE						10
+#define PAGE_SIZE						100
 #define PAGE_BACKGROUND_COLOR			RGB(252, 252, 255)
 
 // CAlarmDlg 瀵硅瘽妗�
@@ -21,7 +23,9 @@
 	m_hbrBkgnd = nullptr;
 	m_pObserver = nullptr;
 
-	m_strEqName = "";
+	m_nSeverityLevel = 0;
+	m_strDeviceName = "";
+	m_strUnitName = "";
 	m_strKeyword = "";
 	m_nCurPage = 0;
 	m_nTotalPages = 0;
@@ -48,18 +52,13 @@
 			// onNext
 			pAny->addRef();
 			int code = pAny->getCode();
-			//if (RX_CODE_ALARM_ON == code) {
-			//	CAlarm* pAlarm;
-			//	if (pAny->getObject("obj", (IRxObject*&)pAlarm)) {
-			//		AddAlarm(nullptr, pAlarm);
-			//	}
-			//}
-			//else if (RX_CODE_ALARM_OFF == code) {
-			//	CAlarm* pAlarm;
-			//	if (pAny->getObject("obj", (IRxObject*&)pAlarm)) {
-			//		UpdateAlarm(nullptr, pAlarm);
-			//	}
-			//}
+
+			if (RX_CODE_ALARM_SET == code) {
+				UpdatePageData();
+			}
+			else if (RX_CODE_ALARM_CLEAR == code) {
+				UpdatePageData();
+			}
 
 		pAny->release();
 		}, [&]() -> void {
@@ -69,8 +68,8 @@
 			pThrowable->printf();
 		});
 
-		//theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())
-		//	->subscribe(m_pObserver);
+		theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())
+			->subscribe(m_pObserver);
 	}
 }
 
@@ -81,62 +80,20 @@
 	GetClientRect(&rcClient);
 
 	pItem = GetDlgItem(IDC_LIST_ALARM);
-	pItem->MoveWindow(12, 52, rcClient.Width() - 24, rcClient.Height() - 64);
+	pItem->MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
 }
 
 void CAlarmDlg::LoadAlarms()
 {
-	//CAlarmMonitor* pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
-
-	// 褰撳墠姝ｅ湪鍙戠敓鐨勬姤璀�
-	//pMonitor->Lock();
-	//std::map<int, CAlarm*>& alarmings = pMonitor->getAlarmingMap();
-	//for (auto item : alarmings) {
-	//	AddAlarm(pMonitor, item.second);
-	//}
-	//pMonitor->Unlock();
-
 	// 鍒锋柊鍘嗗彶鎶ヨ鏁版嵁
 	m_nCurPage = 1;
 	UpdatePageData();
 }
 
-//void CAlarmDlg::AddAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
-//{
-//	if (pMonitor == nullptr) {
-//		pMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
-//	}
-//	CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
-//	pListCtrl->InsertItem(0, _T(""));
-//	pListCtrl->SetItemData(0, (DWORD_PTR)pAlarm);
-//	pAlarm->addRef();
-//	pListCtrl->SetItemText(0, 1, std::to_string(pAlarm->getId()).c_str());
-//	pListCtrl->SetItemText(0, 2, pMonitor->getAlarmText(pAlarm->getId()));
-//	pListCtrl->SetItemText(0, 3, CToolUnits::timeToString2(pAlarm->getOnTime()).c_str());
-//	if (pAlarm->getOffTime() > 0) {
-//		pListCtrl->SetItemText(0, 4, CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
-//	}
-//}
-
-//void CAlarmDlg::UpdateAlarm(CAlarmMonitor* pMonitor, CAlarm* pAlarm)
-//{
-//	if (pMonitor == nullptr) {
-//		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());
-//			}
-//		}
-//	}
-//}
-
 void CAlarmDlg::UpdatePageData()
 {
 	// 鏍规嵁杩囨护鏉′欢鍔犺浇鏁版嵁锛屾彁渚涙弿杩板拰鏃堕棿鑼冨洿鏌ヨ
-	auto vecData = AlarmManager::getInstance().getFilteredAlarms("", m_strEqName, m_strKeyword, m_szTimeStart, m_szTimeEnd, m_nCurPage, PAGE_SIZE);
+	auto vecData = AlarmManager::getInstance().getFilteredAlarms("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd, m_nCurPage, PAGE_SIZE);
 
 	// 濉厖鏁版嵁鍒版帶浠�
 	CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
@@ -158,26 +115,69 @@
 	GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
 }
 
-void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<std::vector<std::string>>& vecData)
+void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
 {
+	if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+		return;
+	}
+
 	// 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
 	pListCtrl->DeleteAllItems();
 
 	// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
-	for (const auto& item : vecData) {
-		int nItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T(""));	// 鎻掑叆鏂拌
-		pListCtrl->SetItemText(nItem, 1, item[0].c_str());						// 璁剧疆绗竴鍒楃殑鏂囨湰锛圛D锛�
-		pListCtrl->SetItemText(nItem, 2, item[1].c_str());						// 璁剧疆绗簩鍒楃殑鏂囨湰锛堣澶囧悕绉帮級
-		pListCtrl->SetItemText(nItem, 3, item[2].c_str());						// 璁剧疆绗笁鍒楃殑鏂囨湰锛堟弿杩帮級
-		pListCtrl->SetItemText(nItem, 4, item[3].c_str());						// 璁剧疆绗洓鍒楃殑鏂囨湰锛堝紑濮嬫椂闂达級
-		pListCtrl->SetItemText(nItem, 5, item[4].c_str());						// 璁剧疆绗洓鍒楃殑鏂囨湰锛堣В闄ゆ椂闂达級
+	for (const auto& alarm : vecData) {
+		InsertAlarmData(pListCtrl, alarm);
 	}
+
+	// 鑾峰彇鍒楁暟
+	int nColCount = pListCtrl->GetHeaderCtrl()->GetItemCount();
+	pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
+}
+
+static char* pszAlarmLevel[] = { "Warning", "Error" };
+void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
+{
+	if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+		return;
+	}
+
+	int nRowCount = pListCtrl->GetItemCount();
+	if (nRowCount >= PAGE_SIZE) {
+		pListCtrl->DeleteItem(nRowCount - 1);
+	}
+
+	int nNewItem = pListCtrl->InsertItem(0, _T(""));
+
+	// 璁剧疆姣忎竴鍒楃殑鏁版嵁
+	CString str;
+	str.Format(_T("%d"), alarmData.nId);
+	pListCtrl->SetItemText(nNewItem, 1, str);											// 鎶ヨID
+	pListCtrl->SetItemText(nNewItem, 2, pszAlarmLevel[alarmData.nSeverityLevel % 2]);	// 绛夌骇
+	pListCtrl->SetItemText(nNewItem, 3, alarmData.strDeviceName.c_str());               // 璁惧鍚嶇О
+	pListCtrl->SetItemText(nNewItem, 4, alarmData.strUnitName.c_str());                 // 鍗曞厓鍚嶇О
+	pListCtrl->SetItemText(nNewItem, 5, alarmData.strStartTime.c_str());                // 寮�濮嬫椂闂�
+	pListCtrl->SetItemText(nNewItem, 6, alarmData.strEndTime.c_str());                  // 缁撴潫鏃堕棿
+	pListCtrl->SetItemText(nNewItem, 7, alarmData.strDescription.c_str());              // 鎻忚堪
+}
+
+std::string CAlarmDlg::getCurrentTimeString()
+{
+	auto now = std::chrono::system_clock::now();
+	auto time_t_now = std::chrono::system_clock::to_time_t(now);
+
+	std::tm tm_now = {};
+	localtime_s(&tm_now, &time_t_now);
+
+	std::stringstream ss;
+	ss << std::put_time(&tm_now, "%Y-%m-%d %H:%M:%S");
+	return ss.str();
 }
 
 void CAlarmDlg::DoDataExchange(CDataExchange* pDX)
 {
 	DDX_Control(pDX, IDC_DATETIMEPICKER_START, m_dateTimeStart);
 	DDX_Control(pDX, IDC_DATETIMEPICKER_END, m_dateTimeEnd);
+	DDX_Control(pDX, IDC_LIST_ALARM, m_listCtrl);
 	CDialogEx::DoDataExchange(pDX);
 }
 
@@ -185,7 +185,9 @@
 BEGIN_MESSAGE_MAP(CAlarmDlg, CDialogEx)
 	ON_WM_CTLCOLOR()
 	ON_WM_DESTROY()
+	ON_WM_CLOSE()
 	ON_WM_SIZE()
+	ON_WM_TIMER()
 	ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CAlarmDlg::OnCbnSelchangeComboDatetime)
 	ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CAlarmDlg::OnBnClickedButtonSearch)
 	ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CAlarmDlg::OnBnClickedButtonExport)
@@ -198,7 +200,7 @@
 BOOL CAlarmDlg::OnInitDialog()
 {
 	CDialogEx::OnInitDialog();
-	InitRxWindow();
+	SetTimer(1, 3000, nullptr);
 
 	// 涓嬫媺妗嗘帶浠�
 	CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
@@ -214,6 +216,17 @@
 	m_dateTimeStart.EnableWindow(FALSE);
 	m_dateTimeEnd.EnableWindow(FALSE);
 
+
+	// 璇诲嚭鍒楀
+	CString strIniFile, strItem;
+	strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+	int width[8] = { 0, 80, 180, 80, 80, 100, 80, 180};
+	for (int i = 0; i < 8; i++) {
+		strItem.Format(_T("Col_%d_Width"), i);
+		width[i] = GetPrivateProfileInt("AlarmListCtrl", strItem, width[i], strIniFile);
+	}
+
+
 	// 鎶ヨ〃鎺т欢
 	CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
 	DWORD dwStyle = pListCtrl->GetExtendedStyle();
@@ -223,15 +236,19 @@
 
 	HIMAGELIST imageList = ImageList_Create(24, 24, ILC_COLOR24, 1, 1);
 	ListView_SetImageList(pListCtrl->GetSafeHwnd(), imageList, LVSIL_SMALL);
-	pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, 0);
-	pListCtrl->InsertColumn(1, _T("璀﹀憡ID"), LVCFMT_LEFT, 50);
-	pListCtrl->InsertColumn(2, _T("璁惧鍚嶇О"), LVCFMT_LEFT, 120);
-	pListCtrl->InsertColumn(3, _T("鎻忚堪"), LVCFMT_LEFT, 280);
-	pListCtrl->InsertColumn(4, _T("鍙戠敓鏃堕棿"), LVCFMT_LEFT, 180);
-	pListCtrl->InsertColumn(5, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, 180);
+	pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, width[0]);
+	pListCtrl->InsertColumn(1, _T("璀﹀憡ID"), LVCFMT_LEFT, width[1]);
+	pListCtrl->InsertColumn(2, _T("鎶ヨ绛夌骇"), LVCFMT_LEFT, width[2]);
+	pListCtrl->InsertColumn(3, _T("璁惧鍚嶇О"), LVCFMT_LEFT, width[3]);
+	pListCtrl->InsertColumn(4, _T("鍗曞厓鍚嶇О"), LVCFMT_LEFT, width[4]);
+	pListCtrl->InsertColumn(5, _T("鍙戠敓鏃堕棿"), LVCFMT_LEFT, width[5]);
+	pListCtrl->InsertColumn(6, _T("瑙ｉ櫎鏃堕棿"), LVCFMT_LEFT, width[6]);
+	pListCtrl->InsertColumn(7, _T("鎻忚堪"), LVCFMT_LEFT, width[7]);
+	pListCtrl->SetColumnWidth(7, LVSCW_AUTOSIZE_USEHEADER);
+
 
 	// 璁＄畻鎬婚〉鏁�
-	int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", m_strEqName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
+	int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
 	m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
 	m_nCurPage = 1;
 
@@ -240,19 +257,6 @@
 
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
-}
-
-BOOL CAlarmDlg::DestroyWindow()
-{
-	//CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
-	//for (int i = 0; i < pListCtrl->GetItemCount(); i++) {
-	//	CAlarm* pAlarm = (CAlarm*)pListCtrl->GetItemData(i);
-	//	if (pAlarm != nullptr) {
-	//		pAlarm->release();
-	//	}
-	//}
-
-	return CDialogEx::DestroyWindow();
 }
 
 HBRUSH CAlarmDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
@@ -274,6 +278,20 @@
 {
 	CDialogEx::OnDestroy();
 
+
+	// 淇濆瓨鍒楀
+	CString strIniFile, strItem, strTemp;
+	strIniFile.Format(_T("%s\\configuration.ini"), (LPTSTR)(LPCTSTR)theApp.m_strAppDir);
+	CHeaderCtrl* pHeader = m_listCtrl.GetHeaderCtrl();
+	for (int i = 0; i < pHeader->GetItemCount(); i++) {
+		RECT rect;
+		pHeader->GetItemRect(i, &rect);
+		strItem.Format(_T("Col_%d_Width"), i);
+		strTemp.Format(_T("%d"), rect.right - rect.left);
+		WritePrivateProfileString("AlarmListCtrl", strItem, strTemp, strIniFile);
+	}
+
+
 	if (m_hbrBkgnd != nullptr) {
 		::DeleteObject(m_hbrBkgnd);
 	}
@@ -284,11 +302,25 @@
 	}
 }
 
+void CAlarmDlg::OnClose()
+{
+	ShowWindow(SW_HIDE);
+	GetParent()->PostMessage(ID_MSG_ALARMDLG_HIDE, 0, 0);
+}
+
 void CAlarmDlg::OnSize(UINT nType, int cx, int cy)
 {
 	CDialogEx::OnSize(nType, cx, cy);
 	if (GetDlgItem(IDC_LIST_ALARM) == nullptr) return;
 	Resize();
+}
+
+void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
+{
+	if (1 == nIDEvent) {
+		KillTimer(1);
+		InitRxWindow();
+	}
 }
 
 void CAlarmDlg::OnCbnSelchangeComboDatetime()
@@ -353,7 +385,7 @@
 	}
 
 	// 璁＄畻鎬婚〉鏁�
-	int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", m_strEqName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
+	int totalRecords = AlarmManager::getInstance().getTotalAlarmCount("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd);
 	m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
 	m_nCurPage = 1;
 

--
Gitblit v1.9.3