LAPTOP-SNT8I5JK\Boounion
2025-03-10 9543f2d581d05a0f98de787ab131e8d97e0291a2
SourceCode/Bond/Servo/Model.cpp
@@ -126,9 +126,23 @@
            if (state == 1) {
               LOGE("<CAlarmDlg> 发生警告");
               std::string startTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
               std::string endTime = "";
               bool result = alarmManager.addAlarm(std::to_string(pEqAlarmStep->getAlarmId()),
                  pEquipment->getName(), strAlarmText, startTime, endTime);
               std::string endTime = "2000-01-01 00:00";
               AlarmData alarmData;
               alarmData.nId = pEqAlarmStep->getAlarmId();
               alarmData.nSeverityLevel = pEqAlarmStep->getAlarmLevel();
               alarmData.nDeviceId = pEqAlarmStep->getEquipment()->getID();
               alarmData.nUnitId = pEqAlarmStep->getUnitId();
               alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
               alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
               alarmData.strStartTime = startTime;
               alarmData.strEndTime = endTime;
               const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
               alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
               int nAlarmEventId = 0;
               bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
               if (result) {
                  LOGI("<CAlarmDlg> Alarm added successfully!");
               }
@@ -138,8 +152,10 @@
            }
            else {
               LOGE("<CAlarmDlg> i消除警告");
               //alarmManager.updateAlarmEndTime(std::to_string(pEqAlarmStep->getAlarmId()),
               //   pEquipment->getName());
               alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
                  pEqAlarmStep->getEquipment()->getID(),
                  pEqAlarmStep->getUnitId(),
                  CToolUnits::getCurrentTimeString());
            }
            m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),