Merge branch 'clh'

LAPTOP-SNT8I5JK\Boounion

2025-05-13 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037

 SourceCode/Bond/Servo/PageAlarm.cpp

ÎļþÃû´Ó SourceCode/Bond/Servo/AlarmDlg.cpp ÐÞ¸Ä
@@ -4,7 +4,7 @@
#include "stdafx.h"
#include "Servo.h"
#include "afxdialogex.h"
#include "AlarmDlg.h"
#include "PageAlarm.h"
#include "AlarmManager.h"
#include "Common.h"
#include <iomanip>
@@ -12,11 +12,11 @@
#define PAGE_SIZE                  100
#define PAGE_BACKGROUND_COLOR         RGB(252, 252, 255)

// CAlarmDlg å¯¹è¯æ¡†
// CPageAlarm å¯¹è¯æ¡†

IMPLEMENT_DYNAMIC(CAlarmDlg, CDialogEx)
IMPLEMENT_DYNAMIC(CPageAlarm, CDialogEx)

CAlarmDlg::CAlarmDlg(CWnd* pParent /*=nullptr*/)
CPageAlarm::CPageAlarm(CWnd* pParent /*=nullptr*/)
   : CDialogEx(IDD_DIALOG_ALARM, pParent)
{
   m_crBkgnd = PAGE_BACKGROUND_COLOR;
@@ -37,11 +37,11 @@
   m_szTimeEnd[0] = '\0';
}

CAlarmDlg::~CAlarmDlg()
CPageAlarm::~CPageAlarm()
{
}

void CAlarmDlg::InitRxWindow()
void CPageAlarm::InitRxWindow()
{
   /* code */
   // è®¢é˜…数据
@@ -73,7 +73,7 @@
   }
}

void CAlarmDlg::Resize()
void CPageAlarm::Resize()
{
   CWnd* pItem;
   CRect rcClient;
@@ -83,14 +83,14 @@
   pItem->MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
}

void CAlarmDlg::LoadAlarms()
void CPageAlarm::LoadAlarms()
{
   // åˆ·æ–°åŽ†å²æŠ¥è­¦æ•°æ®
   m_nCurPage = 1;
   UpdatePageData();
}

void CAlarmDlg::UpdatePageData()
void CPageAlarm::UpdatePageData()
{
   // æ ¹æ®è¿‡æ»¤æ¡ä»¶åŠ è½½æ•°æ®ï¼Œæä¾›æè¿°å’Œæ—¶é—´èŒƒå›´æŸ¥è¯¢
   auto vecData = AlarmManager::getInstance().getFilteredAlarms("", "", m_strDeviceName, m_strUnitName, m_strKeyword, m_szTimeStart, m_szTimeEnd, m_nCurPage, PAGE_SIZE);
@@ -103,7 +103,7 @@
   UpdatePageControls();
}

void CAlarmDlg::UpdatePageControls()
void CPageAlarm::UpdatePageControls()
{
   // æ›´æ–°åˆ†é¡µä¿¡æ¯
   CString strPage;
@@ -115,7 +115,11 @@
   GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}

<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
=======
void CPageAlarm::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
   if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
      return;
@@ -135,7 +139,11 @@
}

static char* pszAlarmLevel[] = { "Warning", "Error" };
<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
=======
void CPageAlarm::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
   if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
      return;
@@ -160,7 +168,7 @@
   pListCtrl->SetItemText(nNewItem, 7, alarmData.strDescription.c_str());              // æè¿°
}

std::string CAlarmDlg::getCurrentTimeString()
std::string CPageAlarm::getCurrentTimeString()
{
   auto now = std::chrono::system_clock::now();
   auto time_t_now = std::chrono::system_clock::to_time_t(now);
@@ -173,7 +181,7 @@
   return ss.str();
}

void CAlarmDlg::DoDataExchange(CDataExchange* pDX)
void CPageAlarm::DoDataExchange(CDataExchange* pDX)
{
   DDX_Control(pDX, IDC_DATETIMEPICKER_START, m_dateTimeStart);
   DDX_Control(pDX, IDC_DATETIMEPICKER_END, m_dateTimeEnd);
@@ -182,22 +190,30 @@
}


BEGIN_MESSAGE_MAP(CAlarmDlg, CDialogEx)
BEGIN_MESSAGE_MAP(CPageAlarm, CDialogEx)
   ON_WM_CTLCOLOR()
   ON_WM_DESTROY()
   ON_WM_CLOSE()
   ON_WM_SIZE()
<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
   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)
   ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CAlarmDlg::OnBnClickedButtonPrevPage)
   ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CAlarmDlg::OnBnClickedButtonNextPage)
=======
   ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CPageAlarm::OnCbnSelchangeComboDatetime)
   ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageAlarm::OnBnClickedButtonSearch)
   ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CPageAlarm::OnBnClickedButtonExport)
   ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CPageAlarm::OnBnClickedButtonPrevPage)
   ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CPageAlarm::OnBnClickedButtonNextPage)
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
END_MESSAGE_MAP()


// CAlarmDlg æ¶ˆæ¯å¤„理程序
BOOL CAlarmDlg::OnInitDialog()
BOOL CPageAlarm::OnInitDialog()
{
   CDialogEx::OnInitDialog();
   SetTimer(1, 3000, nullptr);
@@ -259,7 +275,7 @@
   // å¼‚常: OCX å±žæ€§é¡µåº”返回 FALSE
}

HBRUSH CAlarmDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
HBRUSH CPageAlarm::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
{
   HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);

@@ -274,7 +290,7 @@
   return m_hbrBkgnd;
}

void CAlarmDlg::OnDestroy()
void CPageAlarm::OnDestroy()
{
   CDialogEx::OnDestroy();

@@ -302,19 +318,20 @@
   }
}

void CAlarmDlg::OnClose()
void CPageAlarm::OnClose()
{
   ShowWindow(SW_HIDE);
   GetParent()->PostMessage(ID_MSG_ALARMDLG_HIDE, 0, 0);
}

void CAlarmDlg::OnSize(UINT nType, int cx, int cy)
void CPageAlarm::OnSize(UINT nType, int cx, int cy)
{
   CDialogEx::OnSize(nType, cx, cy);
   if (GetDlgItem(IDC_LIST_ALARM) == nullptr) return;
   Resize();
}

<<<<<<< HEAD:SourceCode/Bond/Servo/AlarmDlg.cpp
void CAlarmDlg::OnTimer(UINT_PTR nIDEvent)
{
   if (1 == nIDEvent) {
@@ -324,6 +341,9 @@
}

void CAlarmDlg::OnCbnSelchangeComboDatetime()
=======
void CPageAlarm::OnCbnSelchangeComboDatetime()
>>>>>>> clh:SourceCode/Bond/Servo/PageAlarm.cpp
{
   CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
   int nIndex = pComboBox->GetCurSel();
@@ -332,7 +352,7 @@
   m_dateTimeEnd.EnableWindow(nIndex == nCount - 1);
}

void CAlarmDlg::OnBnClickedButtonSearch()
void CPageAlarm::OnBnClickedButtonSearch()
{
   // èŽ·å–关键字
   CString cstrKeyword;
@@ -392,7 +412,7 @@
   UpdatePageData();  // è°ƒç”¨åˆ†é¡µæ›´æ–°å‡½æ•°
}

void CAlarmDlg::OnBnClickedButtonExport()
void CPageAlarm::OnBnClickedButtonExport()
{
   CFileDialog fileDialog(FALSE, "csv", "", OFN_HIDEREADONLY, "csv.files(*.csv)|*.csv||");
   if (fileDialog.DoModal() != IDOK) {
@@ -452,14 +472,14 @@
   file.Close();
}

void CAlarmDlg::OnBnClickedButtonPrevPage()
void CPageAlarm::OnBnClickedButtonPrevPage()
{
   // ç‚¹å‡»ä¸Šä¸€é¡µ
   m_nCurPage--;
   UpdatePageData();  // è°ƒç”¨åˆ†é¡µæ›´æ–°å‡½æ•°
}

void CAlarmDlg::OnBnClickedButtonNextPage()
void CPageAlarm::OnBnClickedButtonNextPage()
{
   // ç‚¹å‡»ä¸‹ä¸€é¡µ
   m_nCurPage++;