~chenluhua/Bond2.git

			@@ -124,10 +124,6 @@
			}
			int state = pEqAlarmStep->getAlarmState();
			if (state == 1) {
			LOGE("<CAlarmDlg> 发生警告");
			std::string startTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
			std::string endTime = "2000-01-01 00:00";

			AlarmData alarmData;
			alarmData.nId = pEqAlarmStep->getAlarmId();
			alarmData.nSeverityLevel = pEqAlarmStep->getAlarmLevel();
			@@ -135,8 +131,8 @@
			alarmData.nUnitId = pEqAlarmStep->getUnitId();
			alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
			alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
			alarmData.strStartTime = startTime;
			alarmData.strEndTime = endTime;
			alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
			alarmData.strEndTime = "";

			const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
			alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
			@@ -144,16 +140,20 @@
			int nAlarmEventId = 0;
			bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
			if (result) {
			LOGI("<CAlarmDlg> Alarm added successfully!");
			LOGI("<CModel> Alarm added successfully!");
			}
			else {
			LOGE("<CAlarmDlg> Failed to add alarm.");
			LOGE("<CModel> Failed to add alarm.");
			}

			notifyPtr(RX_CODE_ALARM_SET, pStep);
			}
			else {
			LOGE("<CAlarmDlg> i消除警告");
			//alarmManager.updateAlarmEndTime(std::to_string(pEqAlarmStep->getAlarmId()),
			// pEquipment->getName());
			alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
			pEqAlarmStep->getEquipment()->getID(),
			pEqAlarmStep->getUnitId(),
			CToolUnits::getCurrentTimeString());
			notifyPtr(RX_CODE_ALARM_CLEAR, pStep);
			}

			m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),