1.增加CVcrEventStep

LAPTOP-SNT8I5JK\Boounion

2025-04-26 410ea79955e2d115643a38f40e006f1aeaba897b

 SourceCode/Bond/Servo/Model.cpp

@@ -36,7 +36,7 @@
   m_configuration.getUnitId(strUnitId);

   // 机器型号和软件版本号应从配置中读取，当前先固定值
   CString strModeType = _T("Bond2860");
   CString strModeType = _T("Master");
   CString strSoftRev = _T("1.0.2");


@@ -105,65 +105,60 @@
      notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);

   };
   masterListener.onEqStepEvent = [&](SERVO::CStep* pStep, int code, void* pData) -> void {
      if (code == STEP_EVENT_READDATA) {
         LOGI("<CModel>onEqStepEvent,数据变化:%s(%s, 0x%x).\n", pStep->getEquipment()->getName().c_str(),
            pStep->getName().c_str(), pData);
         notifyPtr(RX_CODE_STEP_EVENT_READDATA, pStep);
			
         // 处理警告信息
         if (isAlarmStep(pStep)) {
            // 保存到数据库
            AlarmManager& alarmManager = AlarmManager::getInstance();
            std::string strAlarmText;
            SERVO::CEquipment* pEquipment = pStep->getEquipment();
            SERVO::CEqAlarmStep* pEqAlarmStep = (SERVO::CEqAlarmStep*)pStep;
            const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(pEqAlarmStep->getAlarmId());
            if (pAlarmInfo != nullptr) {
               strAlarmText = pAlarmInfo->strAlarmText;
            }
            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();
               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!");
               }
               else {
                  LOGE("<CAlarmDlg> Failed to add alarm.");
               }
            }
            else {
               LOGE("<CAlarmDlg> i消除警告");
               //alarmManager.updateAlarmEndTime(std::to_string(pEqAlarmStep->getAlarmId()), 
               //   pEquipment->getName());
            }

            m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),
               pEquipment->getBaseAlarmId() + pEqAlarmStep->getAlarmId(),
               strAlarmText.c_str());
         }
   masterListener.onEqAlarm = [&](void* pMaster, SERVO::CEquipment* pEquipment, int state, int alarmId, int unitId, int level) -> void {
      AlarmManager& alarmManager = AlarmManager::getInstance();
      std::string strAlarmText;
      const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(alarmId);
      if (pAlarmInfo != nullptr) {
         strAlarmText = pAlarmInfo->strAlarmText;
      }
   };
      if (state == 1) {
         AlarmData alarmData;
         alarmData.nId = alarmId;
         alarmData.nSeverityLevel = level;
         alarmData.nDeviceId = pEquipment->getID();
         alarmData.nUnitId = unitId;
         alarmData.strDeviceName = alarmManager.getDeviceNameById(alarmData.nDeviceId);
         alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
         alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
         alarmData.strEndTime = "";

         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("<CModel> Alarm added successfully!");
         }
         else {
            LOGE("<CModel> Failed to add alarm.");
         }

         notify(RX_CODE_ALARM_SET);
      }
      else {
         alarmManager.clearAlarmByAttributes(alarmId,
            pEquipment->getID(),
            unitId,
            CToolUnits::getCurrentTimeString());
         notify(RX_CODE_ALARM_CLEAR);
      }

      m_hsmsPassive.requestAlarmReport(state,
         pEquipment->getBaseAlarmId() + alarmId,
         strAlarmText.c_str());
   };
   masterListener.onEqVcrEventReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, SERVO::CVcrEventReport* pReport) {
      LOGE("<CModel>onEqVcrEventReport.");
   };
   m_master.setListener(masterListener);


   // master 设置缓存文件
   CString strMasterDataFile;
   strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
   m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);


   // 加载警告信息
@@ -389,9 +384,4 @@
   }

   return 0;
}

bool CModel::isAlarmStep(SERVO::CStep* pStep)
{
   return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
}