diff --git a/CHANGELOG b/CHANGELOG index 2a78a4807..ed8ebeed9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-08-10 Version: 1.36.566 +- Generated 2020-05-18 for `dataworks-public`. + 2020-08-10 Version: 1.36.565 - Add source id for list face detail. diff --git a/VERSION b/VERSION index 527e041fd..652ebf1b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.565 \ No newline at end of file +1.36.566 \ No newline at end of file diff --git a/dataworks-public/include/alibabacloud/dataworks-public/model/CreateProjectMemberRequest.h b/dataworks-public/include/alibabacloud/dataworks-public/model/CreateProjectMemberRequest.h index 2de53ce70..2366912f0 100644 --- a/dataworks-public/include/alibabacloud/dataworks-public/model/CreateProjectMemberRequest.h +++ b/dataworks-public/include/alibabacloud/dataworks-public/model/CreateProjectMemberRequest.h @@ -35,6 +35,8 @@ namespace AlibabaCloud CreateProjectMemberRequest(); ~CreateProjectMemberRequest(); + std::string getRoleCode()const; + void setRoleCode(const std::string& roleCode); std::string getClientToken()const; void setClientToken(const std::string& clientToken); long getProjectId()const; @@ -43,6 +45,7 @@ namespace AlibabaCloud void setUserId(const std::string& userId); private: + std::string roleCode_; std::string clientToken_; long projectId_; std::string userId_; diff --git a/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersRequest.h b/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersRequest.h index bfe4520e8..cee06b538 100644 --- a/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersRequest.h +++ b/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud int getPageSize()const; void setPageSize(int pageSize); - int getPageNum()const; - void setPageNum(int pageNum); long getProjectId()const; void setProjectId(long projectId); + int getPageNumber()const; + void setPageNumber(int pageNumber); private: int pageSize_; - int pageNum_; long projectId_; + int pageNumber_; }; } diff --git a/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersResult.h b/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersResult.h index d2a8a8d54..65bbcf429 100644 --- a/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersResult.h +++ b/dataworks-public/include/alibabacloud/dataworks-public/model/ListProjectMembersResult.h @@ -32,40 +32,40 @@ namespace AlibabaCloud class ALIBABACLOUD_DATAWORKS_PUBLIC_EXPORT ListProjectMembersResult : public ServiceResult { public: - struct ProjectMember + struct Data { - struct Role + struct ProjectMember { - std::string projectRoleName; - std::string projectRoleType; - std::string projectRoleCode; - int projectRoleId; + struct Role + { + std::string projectRoleName; + std::string projectRoleType; + std::string projectRoleCode; + int projectRoleId; + }; + std::string status; + std::vector projectRoleList; + std::string projectMemberType; + std::string projectMemberId; + std::string nick; + std::string projectMemberName; }; - std::string createOn; - std::string status; - std::vector projectRoleList; - std::string projectMemberType; - std::string projectMemberId; - std::string nick; - std::string projectMemberName; + int totalCount; + std::vector projectMemberList; + int pageSize; + int pageNumber; }; ListProjectMembersResult(); explicit ListProjectMembersResult(const std::string &payload); ~ListProjectMembersResult(); - int getTotalNum()const; - std::vector getProjectMemberList()const; - int getPageNum()const; - int getPageSize()const; + Data getData()const; protected: void parse(const std::string &payload); private: - int totalNum_; - std::vector projectMemberList_; - int pageNum_; - int pageSize_; + Data data_; }; } diff --git a/dataworks-public/src/model/CreateProjectMemberRequest.cc b/dataworks-public/src/model/CreateProjectMemberRequest.cc index 901c8e36d..8279632ce 100644 --- a/dataworks-public/src/model/CreateProjectMemberRequest.cc +++ b/dataworks-public/src/model/CreateProjectMemberRequest.cc @@ -27,6 +27,17 @@ CreateProjectMemberRequest::CreateProjectMemberRequest() : CreateProjectMemberRequest::~CreateProjectMemberRequest() {} +std::string CreateProjectMemberRequest::getRoleCode()const +{ + return roleCode_; +} + +void CreateProjectMemberRequest::setRoleCode(const std::string& roleCode) +{ + roleCode_ = roleCode; + setParameter("RoleCode", roleCode); +} + std::string CreateProjectMemberRequest::getClientToken()const { return clientToken_; diff --git a/dataworks-public/src/model/ListProjectMembersRequest.cc b/dataworks-public/src/model/ListProjectMembersRequest.cc index cb1c12257..a0ce33360 100644 --- a/dataworks-public/src/model/ListProjectMembersRequest.cc +++ b/dataworks-public/src/model/ListProjectMembersRequest.cc @@ -38,17 +38,6 @@ void ListProjectMembersRequest::setPageSize(int pageSize) setParameter("PageSize", std::to_string(pageSize)); } -int ListProjectMembersRequest::getPageNum()const -{ - return pageNum_; -} - -void ListProjectMembersRequest::setPageNum(int pageNum) -{ - pageNum_ = pageNum; - setParameter("PageNum", std::to_string(pageNum)); -} - long ListProjectMembersRequest::getProjectId()const { return projectId_; @@ -60,3 +49,14 @@ void ListProjectMembersRequest::setProjectId(long projectId) setParameter("ProjectId", std::to_string(projectId)); } +int ListProjectMembersRequest::getPageNumber()const +{ + return pageNumber_; +} + +void ListProjectMembersRequest::setPageNumber(int pageNumber) +{ + pageNumber_ = pageNumber; + setParameter("PageNumber", std::to_string(pageNumber)); +} + diff --git a/dataworks-public/src/model/ListProjectMembersResult.cc b/dataworks-public/src/model/ListProjectMembersResult.cc index 00de1ed5b..24be26b43 100644 --- a/dataworks-public/src/model/ListProjectMembersResult.cc +++ b/dataworks-public/src/model/ListProjectMembersResult.cc @@ -39,26 +39,31 @@ void ListProjectMembersResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); - auto allProjectMemberListNode = value["ProjectMemberList"]["ProjectMember"]; - for (auto valueProjectMemberListProjectMember : allProjectMemberListNode) + auto dataNode = value["Data"]; + if(!dataNode["PageNumber"].isNull()) + data_.pageNumber = std::stoi(dataNode["PageNumber"].asString()); + if(!dataNode["PageSize"].isNull()) + data_.pageSize = std::stoi(dataNode["PageSize"].asString()); + if(!dataNode["TotalCount"].isNull()) + data_.totalCount = std::stoi(dataNode["TotalCount"].asString()); + auto allProjectMemberListNode = dataNode["ProjectMemberList"]["ProjectMember"]; + for (auto dataNodeProjectMemberListProjectMember : allProjectMemberListNode) { - ProjectMember projectMemberListObject; - if(!valueProjectMemberListProjectMember["ProjectMemberId"].isNull()) - projectMemberListObject.projectMemberId = valueProjectMemberListProjectMember["ProjectMemberId"].asString(); - if(!valueProjectMemberListProjectMember["ProjectMemberName"].isNull()) - projectMemberListObject.projectMemberName = valueProjectMemberListProjectMember["ProjectMemberName"].asString(); - if(!valueProjectMemberListProjectMember["ProjectMemberType"].isNull()) - projectMemberListObject.projectMemberType = valueProjectMemberListProjectMember["ProjectMemberType"].asString(); - if(!valueProjectMemberListProjectMember["CreateOn"].isNull()) - projectMemberListObject.createOn = valueProjectMemberListProjectMember["CreateOn"].asString(); - if(!valueProjectMemberListProjectMember["Nick"].isNull()) - projectMemberListObject.nick = valueProjectMemberListProjectMember["Nick"].asString(); - if(!valueProjectMemberListProjectMember["Status"].isNull()) - projectMemberListObject.status = valueProjectMemberListProjectMember["Status"].asString(); + Data::ProjectMember projectMemberObject; + if(!dataNodeProjectMemberListProjectMember["Nick"].isNull()) + projectMemberObject.nick = dataNodeProjectMemberListProjectMember["Nick"].asString(); + if(!dataNodeProjectMemberListProjectMember["ProjectMemberId"].isNull()) + projectMemberObject.projectMemberId = dataNodeProjectMemberListProjectMember["ProjectMemberId"].asString(); + if(!dataNodeProjectMemberListProjectMember["ProjectMemberName"].isNull()) + projectMemberObject.projectMemberName = dataNodeProjectMemberListProjectMember["ProjectMemberName"].asString(); + if(!dataNodeProjectMemberListProjectMember["ProjectMemberType"].isNull()) + projectMemberObject.projectMemberType = dataNodeProjectMemberListProjectMember["ProjectMemberType"].asString(); + if(!dataNodeProjectMemberListProjectMember["Status"].isNull()) + projectMemberObject.status = dataNodeProjectMemberListProjectMember["Status"].asString(); auto allProjectRoleListNode = allProjectMemberListNode["ProjectRoleList"]["Role"]; for (auto allProjectMemberListNodeProjectRoleListRole : allProjectRoleListNode) { - ProjectMember::Role projectRoleListObject; + Data::ProjectMember::Role projectRoleListObject; if(!allProjectMemberListNodeProjectRoleListRole["ProjectRoleCode"].isNull()) projectRoleListObject.projectRoleCode = allProjectMemberListNodeProjectRoleListRole["ProjectRoleCode"].asString(); if(!allProjectMemberListNodeProjectRoleListRole["ProjectRoleId"].isNull()) @@ -67,36 +72,15 @@ void ListProjectMembersResult::parse(const std::string &payload) projectRoleListObject.projectRoleName = allProjectMemberListNodeProjectRoleListRole["ProjectRoleName"].asString(); if(!allProjectMemberListNodeProjectRoleListRole["ProjectRoleType"].isNull()) projectRoleListObject.projectRoleType = allProjectMemberListNodeProjectRoleListRole["ProjectRoleType"].asString(); - projectMemberListObject.projectRoleList.push_back(projectRoleListObject); + projectMemberObject.projectRoleList.push_back(projectRoleListObject); } - projectMemberList_.push_back(projectMemberListObject); + data_.projectMemberList.push_back(projectMemberObject); } - if(!value["PageNum"].isNull()) - pageNum_ = std::stoi(value["PageNum"].asString()); - if(!value["PageSize"].isNull()) - pageSize_ = std::stoi(value["PageSize"].asString()); - if(!value["TotalNum"].isNull()) - totalNum_ = std::stoi(value["TotalNum"].asString()); } -int ListProjectMembersResult::getTotalNum()const +ListProjectMembersResult::Data ListProjectMembersResult::getData()const { - return totalNum_; -} - -std::vector ListProjectMembersResult::getProjectMemberList()const -{ - return projectMemberList_; -} - -int ListProjectMembersResult::getPageNum()const -{ - return pageNum_; -} - -int ListProjectMembersResult::getPageSize()const -{ - return pageSize_; + return data_; }