From 34f6893ffa45a2eeb3636605d5b7c6289d879aa4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 20 九月 2025 13:42:48 +0800
Subject: [PATCH] 1.修复和测试Bath调度，更新数据应用到Master时出错的问题；
---
SourceCode/Bond/Servo/ProcessJob.h | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProcessJob.h b/SourceCode/Bond/Servo/ProcessJob.h
index 1300b46..35fd2da 100644
--- a/SourceCode/Bond/Servo/ProcessJob.h
+++ b/SourceCode/Bond/Servo/ProcessJob.h
@@ -90,6 +90,7 @@
explicit CProcessJob(std::string pjId);
const std::string& id() const noexcept { return m_pjId; }
+ void setId(std::string& id);
const std::string& parentCjId() const noexcept { return m_parentCjId; }
PJState state() const noexcept { return m_state; }
StartPolicy startPolicy() const noexcept { return m_startPolicy; }
@@ -121,7 +122,7 @@
};
// 返回问题清单（空=通过）
bool validate(const IResourceView& rv);
- const std::vector<ValidationIssue>& issues();
+ const std::vector<ValidationIssue>& issues() const;
// —— 状态机（带守卫）——
bool queue(); // NoState -> Queued
@@ -130,7 +131,7 @@
bool pause(); // InProcess -> Paused
bool resume(); // Paused -> InProcess
bool complete(); // InProcess -> Completed
- bool abort(); // Any (未终态) -> Aborted
+ bool abort(std::string reason); // Any (未终态) -> Aborted
bool fail(std::string reason); // 任意态 -> Failed（记录失败原因）
// —— 访问器（用于上报/查询）——
@@ -153,9 +154,13 @@
// 追加一个载具
void addCarrier(std::string carrierId, std::vector<uint8_t> slots);
+ // 设置载具slots和contexts
+ bool setCarrierSlotsAndContexts(std::string carrierId, std::vector<uint8_t> slots, std::vector<void*> contexts);
+ bool setCarrierContexts(std::string carrierId, std::vector<void*> contexts);
+
// 访问器
const std::vector<CarrierSlotInfo>& carriers() const noexcept { return m_carriers; }
- CarrierSlotInfo* getCarrier(std::string& strId);
+ CarrierSlotInfo* getCarrier(const std::string& strId);
// 判定是否“按载具/卡位”方式
bool usesCarrierSlots() const noexcept { return !m_carriers.empty(); }
--
Gitblit v1.9.3