diff --git a/ComponentBasic/invisible_component.cpp b/ComponentBasic/invisible_component.cpp index 1a3ff35..9cde28a 100644 --- a/ComponentBasic/invisible_component.cpp +++ b/ComponentBasic/invisible_component.cpp @@ -15,9 +15,9 @@ QString ComponentsInfoPull::name() const #include #include void ComponentsInfoPull::execute(std::shared_ptr map, - std::shared_ptr in, QList>& out) + std::shared_ptr in, QList>& out) { - auto rst = std::make_shared(); + auto rst = std::make_shared(); rst->reset(in->targetEntity(), in->sourceEntity()); auto bind_e = this->_bind_entity.lock(); diff --git a/ComponentBasic/invisible_component.h b/ComponentBasic/invisible_component.h index e1f004c..7b662ff 100644 --- a/ComponentBasic/invisible_component.h +++ b/ComponentBasic/invisible_component.h @@ -2,8 +2,11 @@ #include #include "componentbasic.h" +/// +/// 组件信息提取 +/// class COMPONENTBASIC_EXPORT ComponentsInfoPull : public ProcList< - WsRespond + WsRespond > { private: std::weak_ptr _bind_entity; @@ -15,7 +18,7 @@ public: void bindEntity(std::weak_ptr ins) override; QString name() const override; - void execute(std::shared_ptr map, std::shared_ptr in, QList>& out) override; + void execute(std::shared_ptr map, std::shared_ptr in, QList>& out) override; std::shared_ptr defaultNew() const override; void recoveryFrom(const QJsonObject& obj) override; diff --git a/MessageBasic/messagebasic.cpp b/MessageBasic/messagebasic.cpp index 41fec14..98cddba 100644 --- a/MessageBasic/messagebasic.cpp +++ b/MessageBasic/messagebasic.cpp @@ -234,33 +234,33 @@ TypesQuery::TypesQuery() :AbstractMessage(NAME(TypesQuery)) { } -ComponentInfosQuery::ComponentInfosQuery() - :AbstractMessage(NAME(ComponentInfosQuery)) { +ComponentDatasQuery::ComponentDatasQuery() + :AbstractMessage(NAME(ComponentDatasQuery)) { } -void ComponentInfosQuery::recoveryFrom(const QJsonObject& obj) +void ComponentDatasQuery::recoveryFrom(const QJsonObject& obj) { AbstractMessage::recoveryFrom(obj); UINT64_PEAK(_bind_entity_id); } -void ComponentInfosQuery::saveTo(QJsonObject& obj) const +void ComponentDatasQuery::saveTo(QJsonObject& obj) const { AbstractMessage::saveTo(obj); UINT64_SAVE(_bind_entity_id); } -ComponentInfoQueryResult::ComponentInfoQueryResult() - :AbstractMessage(NAME(ComponentInfoQueryResult)) { +ComponentDatasQueryResult::ComponentDatasQueryResult() + :AbstractMessage(NAME(ComponentDatasQueryResult)) { } -void ComponentInfoQueryResult::recoveryFrom(const QJsonObject& obj) +void ComponentDatasQueryResult::recoveryFrom(const QJsonObject& obj) { AbstractMessage::recoveryFrom(obj); _entity_json = obj["result_json"].toObject(); } -void ComponentInfoQueryResult::saveTo(QJsonObject& obj) const +void ComponentDatasQueryResult::saveTo(QJsonObject& obj) const { AbstractMessage::saveTo(obj); obj["result_json"] = _entity_json; diff --git a/MessageBasic/messagebasic.h b/MessageBasic/messagebasic.h index 60c764e..351a354 100644 --- a/MessageBasic/messagebasic.h +++ b/MessageBasic/messagebasic.h @@ -209,20 +209,20 @@ struct MESSAGEBASIC_EXPORT EntityTotalList : public AbstractMessage { /// /// 获取指定实体的所有组件数据 /// -struct MESSAGEBASIC_EXPORT ComponentInfosQuery : public AbstractMessage { +struct MESSAGEBASIC_EXPORT ComponentDatasQuery : public AbstractMessage { uint64_t _bind_entity_id = 0; - ComponentInfosQuery(); + ComponentDatasQuery(); // 通过 WsMessage 继承 void recoveryFrom(const QJsonObject& obj) override; void saveTo(QJsonObject& obj) const override; }; -struct MESSAGEBASIC_EXPORT ComponentInfoQueryResult : public AbstractMessage { +struct MESSAGEBASIC_EXPORT ComponentDatasQueryResult : public AbstractMessage { QJsonObject _entity_json; - ComponentInfoQueryResult(); + ComponentDatasQueryResult(); // 通过 WsMessage 继承 void recoveryFrom(const QJsonObject& obj) override;