1.调整报警窗口

LAPTOP-SNT8I5JK\Boounion

2025-03-10 469bf4af5180cdee2808b595e2d48d6266992235

 SourceCode/Bond/Servo/AlarmDlg.cpp

@@ -5,6 +5,7 @@
#include "Servo.h"
#include "afxdialogex.h"
#include "AlarmDlg.h"
#include "AlarmManager.h"
#include "Common.h"
#include <iomanip>

@@ -65,32 +66,25 @@
                  AlarmData alarmData;
                  alarmData.nId = pStep->getAlarmId();
                  alarmData.nSeverityLevel = pStep->getAlarmLevel();
                  alarmData.nDeviceId = pStep->getAlarmDev();
                  alarmData.nDeviceId = pStep->getEquipment()->getID();
                  alarmData.nUnitId = pStep->getUnitId();
                  alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
                  alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
                  alarmData.strDescription = pStep->getText();
                  alarmData.strStartTime = getCurrentTimeString();
                  alarmData.strEndTime = "2000-01-01 00:00";

                  const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pStep->getAlarmId());
                  alarmData.strDescription = pAlarmInfo != nullptr ? pAlarmInfo->strAlarmText : "";

                  // 插入列表控件
                  CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_ALARM);
                  if (pListCtrl != nullptr) {
                     InsertAlarmData(pListCtrl, alarmData);
                  }

                  // 添加新的 Alarm 数据
                  int alarmEventId = 0;
                  bool result = alarmManager.addAlarm(alarmData, alarmEventId);
                  if (result) {
                     LOGI("<CAlarmDlg> Alarm added successfully!");
                  }
                  else {
                     LOGI("<CAlarmDlg> Failed to add alarm.");
                  }
               }
            }
         }


      pAny->release();
      }, [&]() -> void {
@@ -112,7 +106,7 @@
   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()
@@ -471,4 +465,4 @@
   // 点击下一页
   m_nCurPage++;
   UpdatePageData();  // 调用分页更新函数
}
}