1.修复以下问题： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 C...

chenluhua1980

2026-01-16 d14420e7f85b5fe7289aafe6bef0c053dede3657

 SourceCode/Bond/Servo/CMaster.cpp

@@ -8,6 +8,9 @@
#include <fstream>
#include "SerializeUtil.h"
#include "CServoUtilsTool.h"
#include "AlarmManager.h"
#include "ToolUnits.h"
#include "Model.h"


namespace SERVO {
@@ -72,6 +75,8 @@
      m_nContinuousWorkingPort = 0;
      m_nContinuousWorkingSlot = 0;
      m_pControlJob = nullptr;
      m_bPauseAlarmRaised = false;
      m_pModelCtx = nullptr;
      m_nTestFlag = 0;
      InitializeCriticalSection(&m_criticalSection);
   }
@@ -119,6 +124,11 @@
   void CMaster::setListener(MasterListener listener)
   {
      m_listener = listener;
   }

   void CMaster::setModelCtx(CModel* pModel)
   {
      m_pModelCtx = pModel;
   }

   CRobotTask* CMaster::getActiveRobotTask()
@@ -879,6 +889,33 @@
                  m_pActiveRobotTask->place();
               }
               unlock(); // 等当前任务完成或中止后继续
               continue;
            }

            // 5.5) 暂停状态检查：若 CJ 或在制 PJ 处于 Paused，暂缓调度新的搬送
            bool pausedByEvent = false;
            if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Paused) {
               pausedByEvent = true;
            }
            for (auto pj : m_inProcesJobs) {
               if (pj != nullptr && pj->state() == PJState::Paused) {
                  pausedByEvent = true;
                  break;
               }
            }
            if (!pausedByEvent && m_bPauseAlarmRaised) {
               if (m_pModelCtx != nullptr) {
                  m_pModelCtx->clearSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, 0, 0);
               }
               else {
                  AlarmManager& alarmManager = AlarmManager::getInstance();
                  alarmManager.clearAlarmByAttributes(ALID_SOFTWARE_PAUSE_EVENT, 0, 0, CToolUnits::getCurrentTimeString());
               }
               m_bPauseAlarmRaised = false;
            }
            if (pausedByEvent) {
               LOGI("<Master>调度暂停：ControlJob/ProcessJob 处于 Paused 状态（可能由 PauseEvent 触发）");
               unlock();
               continue;
            }

@@ -2977,15 +3014,83 @@
      return m_allowedCeids.find(ceid) != m_allowedCeids.end();
   }

   bool CMaster::raiseSoftAlarm(int alarmId,
      const std::string& desc,
      int level/* = -1*/,
      int deviceId/* = 0*/,
      int unitId/* = 0*/,
      const char* deviceName/* = "Software"*/,
      const char* unitName/* = "App"*/)
   {
      AlarmManager& alarmManager = AlarmManager::getInstance();
      const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);

      int severity = level;
      if (severity < 0 && info != nullptr) {
         severity = info->nAlarmLevel;
      }
      if (severity < 0) severity = 0; // fallback

      std::string descText = desc;
      if (descText.empty() && info != nullptr) {
         descText = !info->strDescription.empty() ? info->strDescription : info->strAlarmText;
      }
      if (descText.empty()) {
         descText = CToolUnits::formatString("Alarm %d", alarmId);
      }

      AlarmData alarmData;
      alarmData.nId = alarmId;
      alarmData.nSeverityLevel = severity;
      alarmData.nDeviceId = deviceId;
      alarmData.nUnitId = unitId;
      alarmData.strDeviceName = deviceName;
      alarmData.strUnitName = unitName;
      alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
      alarmData.strEndTime = "";
      alarmData.strDescription = descText;

      int nAlarmEventId = 0;
      return alarmManager.addAlarm(alarmData, nAlarmEventId);
   }

   void CMaster::handleCollectionEvent(uint32_t ceid)
   {
      // 遍历当前 PJ，命中 pauseEvents 时可在此扩展暂停动作
      bool pausedAny = false;
      for (auto pj : m_processJobs) {
         if (pj == nullptr) continue;
         const auto& pauseList = pj->pauseEvents();
         if (std::find(pauseList.begin(), pauseList.end(), ceid) != pauseList.end()) {
            LOGW("<Master>PauseEvent hit: CEID=%u, PJ=%s, state=%d", ceid, pj->id().c_str(), (int)pj->state());
            // TODO: 衔接具体暂停策略（如暂停 PJ/CJ、停止调度/搬送），此处仅留桩位
            if (pj->pause()) {
               LOGI("<Master>PJ paused by CEID=%u", ceid);
               pausedAny = true;
            }
            if (m_pControlJob != nullptr && m_pControlJob->state() == CJState::Executing) {
               if (m_pControlJob->pause()) {
                  LOGI("<Master>ControlJob paused by CEID=%u", ceid);
                  pausedAny = true;
               }
            }
         }
      }
      if (pausedAny && m_listener.onControlJobChanged) {
         // 通知应用层刷新 UI/按钮状态
         m_listener.onControlJobChanged(this);
      }
      if (pausedAny && !m_bPauseAlarmRaised) {
         std::string desc = CToolUnits::formatString("<PauseEvent CEID=%u>", ceid);
         bool raised = false;
         if (m_pModelCtx != nullptr) {
            raised = m_pModelCtx->raiseSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, desc);
         }
         else {
            raised = raiseSoftAlarm(ALID_SOFTWARE_PAUSE_EVENT, desc);
         }
         if (raised) {
            LOGI("<Master>PauseEvent soft alarm raised, CEID=%u", ceid);
            m_bPauseAlarmRaised = true;
         }
      }
   }