1.修改逻辑，CStep不在设置和调用Listener,而是直接调用成员变量m_pEquipment的虚函数onStepEvent来传递数据。

LAPTOP-SNT8I5JK\Boounion

2025-03-29 f354ac6647f9d763c0119717c202e684b261d8ae

 SourceCode/Bond/Servo/Model.cpp

@@ -105,30 +105,19 @@
      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)) {
            // 保存到数据库
   masterListener.onEqAlarm = [&](void* pMaster, SERVO::CEquipment* pEquipment, int state, int alarmId, int unitId, int level) -> void {
            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());
      const AlarmInfo* pAlarmInfo = alarmManager.getAlarmInfoByID(alarmId);
            if (pAlarmInfo != nullptr) {
               strAlarmText = pAlarmInfo->strAlarmText;
            }
            int state = pEqAlarmStep->getAlarmState();
            if (state == 1) {
               AlarmData alarmData;
               alarmData.nId = pEqAlarmStep->getAlarmId();
               alarmData.nSeverityLevel = pEqAlarmStep->getAlarmLevel();
               alarmData.nDeviceId = pEqAlarmStep->getEquipment()->getID();
               alarmData.nUnitId = pEqAlarmStep->getUnitId();
         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());
@@ -146,23 +135,20 @@
                  LOGE("<CModel> Failed to add alarm.");
               }

               notifyPtr(RX_CODE_ALARM_SET, pStep);					
         notify(RX_CODE_ALARM_SET);
            }
            else {
               alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
                  pEqAlarmStep->getEquipment()->getID(),
                  pEqAlarmStep->getUnitId(),
         alarmManager.clearAlarmByAttributes(alarmId,
            pEquipment->getID(),
            unitId,
                  CToolUnits::getCurrentTimeString());
               notifyPtr(RX_CODE_ALARM_CLEAR, pStep);
         notify(RX_CODE_ALARM_CLEAR);
            }

            m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),
               pEquipment->getBaseAlarmId() + pEqAlarmStep->getAlarmId(),
      m_hsmsPassive.requestAlarmReport(state,
         pEquipment->getBaseAlarmId() + alarmId,
               strAlarmText.c_str());
         }
      }
   };

   m_master.setListener(masterListener);


@@ -395,9 +381,4 @@
   }

   return 0;
}

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