diff --git a/CHANGELOG b/CHANGELOG index 96bb91662..ccef11c59 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +2019-11-14 Version 1.36.174 +- Initial construction. +- Public beta version. +- Supported AliyunController for Interface. +- Supported ConsoleController for Interface. +- Supported AccountController for Interface. + 2019-11-13 Version 1.36.173 - Supported Stream analyse. diff --git a/VERSION b/VERSION index be6ecaeb2..462cef47e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.173 \ No newline at end of file +1.36.174 \ No newline at end of file diff --git a/aliyuncvc/CMakeLists.txt b/aliyuncvc/CMakeLists.txt index a814144b6..4274aa9b1 100644 --- a/aliyuncvc/CMakeLists.txt +++ b/aliyuncvc/CMakeLists.txt @@ -41,6 +41,8 @@ set(aliyuncvc_public_header_model include/alibabacloud/aliyuncvc/model/JoinMeetingResult.h include/alibabacloud/aliyuncvc/model/ListEvaluationsRequest.h include/alibabacloud/aliyuncvc/model/ListEvaluationsResult.h + include/alibabacloud/aliyuncvc/model/ListIsvStatisticsRequest.h + include/alibabacloud/aliyuncvc/model/ListIsvStatisticsResult.h include/alibabacloud/aliyuncvc/model/ListMembersRequest.h include/alibabacloud/aliyuncvc/model/ListMembersResult.h include/alibabacloud/aliyuncvc/model/ListUsersRequest.h @@ -68,6 +70,8 @@ set(aliyuncvc_src src/model/JoinMeetingResult.cc src/model/ListEvaluationsRequest.cc src/model/ListEvaluationsResult.cc + src/model/ListIsvStatisticsRequest.cc + src/model/ListIsvStatisticsResult.cc src/model/ListMembersRequest.cc src/model/ListMembersResult.cc src/model/ListUsersRequest.cc diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/AliyuncvcClient.h b/aliyuncvc/include/alibabacloud/aliyuncvc/AliyuncvcClient.h index f5adb85f0..adf2d808f 100644 --- a/aliyuncvc/include/alibabacloud/aliyuncvc/AliyuncvcClient.h +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/AliyuncvcClient.h @@ -42,6 +42,8 @@ #include "model/JoinMeetingResult.h" #include "model/ListEvaluationsRequest.h" #include "model/ListEvaluationsResult.h" +#include "model/ListIsvStatisticsRequest.h" +#include "model/ListIsvStatisticsResult.h" #include "model/ListMembersRequest.h" #include "model/ListMembersResult.h" #include "model/ListUsersRequest.h" @@ -85,6 +87,9 @@ namespace AlibabaCloud typedef Outcome ListEvaluationsOutcome; typedef std::future ListEvaluationsOutcomeCallable; typedef std::function&)> ListEvaluationsAsyncHandler; + typedef Outcome ListIsvStatisticsOutcome; + typedef std::future ListIsvStatisticsOutcomeCallable; + typedef std::function&)> ListIsvStatisticsAsyncHandler; typedef Outcome ListMembersOutcome; typedef std::future ListMembersOutcomeCallable; typedef std::function&)> ListMembersAsyncHandler; @@ -126,6 +131,9 @@ namespace AlibabaCloud ListEvaluationsOutcome listEvaluations(const Model::ListEvaluationsRequest &request)const; void listEvaluationsAsync(const Model::ListEvaluationsRequest& request, const ListEvaluationsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ListEvaluationsOutcomeCallable listEvaluationsCallable(const Model::ListEvaluationsRequest& request) const; + ListIsvStatisticsOutcome listIsvStatistics(const Model::ListIsvStatisticsRequest &request)const; + void listIsvStatisticsAsync(const Model::ListIsvStatisticsRequest& request, const ListIsvStatisticsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + ListIsvStatisticsOutcomeCallable listIsvStatisticsCallable(const Model::ListIsvStatisticsRequest& request) const; ListMembersOutcome listMembers(const Model::ListMembersRequest &request)const; void listMembersAsync(const Model::ListMembersRequest& request, const ListMembersAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ListMembersOutcomeCallable listMembersCallable(const Model::ListMembersRequest& request) const; diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/model/GetUserResult.h b/aliyuncvc/include/alibabacloud/aliyuncvc/model/GetUserResult.h index 1b96730c1..bc1a5680c 100644 --- a/aliyuncvc/include/alibabacloud/aliyuncvc/model/GetUserResult.h +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/model/GetUserResult.h @@ -40,6 +40,7 @@ namespace AlibabaCloud std::string userTel; std::string userId; long createTime; + std::string jobName; std::string userAvatarUrl; std::string userEmail; std::string departName; diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/model/JoinMeetingRequest.h b/aliyuncvc/include/alibabacloud/aliyuncvc/model/JoinMeetingRequest.h index 513c06dab..c105847b6 100644 --- a/aliyuncvc/include/alibabacloud/aliyuncvc/model/JoinMeetingRequest.h +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/model/JoinMeetingRequest.h @@ -35,14 +35,14 @@ namespace AlibabaCloud JoinMeetingRequest(); ~JoinMeetingRequest(); - std::string getMeetingCode()const; - void setMeetingCode(const std::string& meetingCode); std::string getUserId()const; void setUserId(const std::string& userId); + std::string getMeetingCode()const; + void setMeetingCode(const std::string& meetingCode); private: - std::string meetingCode_; std::string userId_; + std::string meetingCode_; }; } diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListIsvStatisticsRequest.h b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListIsvStatisticsRequest.h new file mode 100644 index 000000000..8815a0721 --- /dev/null +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListIsvStatisticsRequest.h @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_ALIYUNCVC_MODEL_LISTISVSTATISTICSREQUEST_H_ +#define ALIBABACLOUD_ALIYUNCVC_MODEL_LISTISVSTATISTICSREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Aliyuncvc + { + namespace Model + { + class ALIBABACLOUD_ALIYUNCVC_EXPORT ListIsvStatisticsRequest : public RpcServiceRequest + { + + public: + ListIsvStatisticsRequest(); + ~ListIsvStatisticsRequest(); + + long getEndTime()const; + void setEndTime(long endTime); + long getStartTime()const; + void setStartTime(long startTime); + + private: + long endTime_; + long startTime_; + + }; + } + } +} +#endif // !ALIBABACLOUD_ALIYUNCVC_MODEL_LISTISVSTATISTICSREQUEST_H_ \ No newline at end of file diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListIsvStatisticsResult.h b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListIsvStatisticsResult.h new file mode 100644 index 000000000..5df8b0b74 --- /dev/null +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListIsvStatisticsResult.h @@ -0,0 +1,75 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_ALIYUNCVC_MODEL_LISTISVSTATISTICSRESULT_H_ +#define ALIBABACLOUD_ALIYUNCVC_MODEL_LISTISVSTATISTICSRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Aliyuncvc + { + namespace Model + { + class ALIBABACLOUD_ALIYUNCVC_EXPORT ListIsvStatisticsResult : public ServiceResult + { + public: + struct Data + { + struct Total + { + int meetingNumber; + int memberNumber; + int meetingLength; + }; + struct Statistic + { + std::string meetingNumber; + std::string memberNumber; + std::string meetingLength; + std::string day; + }; + Total total; + std::vector statistics; + }; + + + ListIsvStatisticsResult(); + explicit ListIsvStatisticsResult(const std::string &payload); + ~ListIsvStatisticsResult(); + std::string getMessage()const; + Data getData()const; + int getErrorCode()const; + bool getSuccess()const; + + protected: + void parse(const std::string &payload); + private: + std::string message_; + Data data_; + int errorCode_; + bool success_; + + }; + } + } +} +#endif // !ALIBABACLOUD_ALIYUNCVC_MODEL_LISTISVSTATISTICSRESULT_H_ \ No newline at end of file diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersRequest.h b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersRequest.h index ffe92bfd8..c12265f8d 100644 --- a/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersRequest.h +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersRequest.h @@ -35,14 +35,14 @@ namespace AlibabaCloud ListUsersRequest(); ~ListUsersRequest(); - int getPageSize()const; - void setPageSize(int pageSize); int getPageNumber()const; void setPageNumber(int pageNumber); + int getPageSize()const; + void setPageSize(int pageSize); private: - int pageSize_; int pageNumber_; + int pageSize_; }; } diff --git a/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersResult.h b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersResult.h index fd86ea184..0f679acfb 100644 --- a/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersResult.h +++ b/aliyuncvc/include/alibabacloud/aliyuncvc/model/ListUsersResult.h @@ -41,6 +41,7 @@ namespace AlibabaCloud std::string userName; std::string userTel; long createTime; + std::string jobName; std::string userAvatarUrl; std::string userEmail; std::string departName; diff --git a/aliyuncvc/src/AliyuncvcClient.cc b/aliyuncvc/src/AliyuncvcClient.cc index b86d3f8a0..8b2ea4fe5 100644 --- a/aliyuncvc/src/AliyuncvcClient.cc +++ b/aliyuncvc/src/AliyuncvcClient.cc @@ -411,6 +411,42 @@ AliyuncvcClient::ListEvaluationsOutcomeCallable AliyuncvcClient::listEvaluations return task->get_future(); } +AliyuncvcClient::ListIsvStatisticsOutcome AliyuncvcClient::listIsvStatistics(const ListIsvStatisticsRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return ListIsvStatisticsOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return ListIsvStatisticsOutcome(ListIsvStatisticsResult(outcome.result())); + else + return ListIsvStatisticsOutcome(outcome.error()); +} + +void AliyuncvcClient::listIsvStatisticsAsync(const ListIsvStatisticsRequest& request, const ListIsvStatisticsAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, listIsvStatistics(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +AliyuncvcClient::ListIsvStatisticsOutcomeCallable AliyuncvcClient::listIsvStatisticsCallable(const ListIsvStatisticsRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->listIsvStatistics(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + AliyuncvcClient::ListMembersOutcome AliyuncvcClient::listMembers(const ListMembersRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/aliyuncvc/src/model/GetUserResult.cc b/aliyuncvc/src/model/GetUserResult.cc index 76d1aafba..7eb388347 100644 --- a/aliyuncvc/src/model/GetUserResult.cc +++ b/aliyuncvc/src/model/GetUserResult.cc @@ -62,6 +62,8 @@ void GetUserResult::parse(const std::string &payload) userInfo_.departId = userInfoNode["DepartId"].asString(); if(!userInfoNode["DepartName"].isNull()) userInfo_.departName = userInfoNode["DepartName"].asString(); + if(!userInfoNode["JobName"].isNull()) + userInfo_.jobName = userInfoNode["JobName"].asString(); if(!value["ErrorCode"].isNull()) errorCode_ = std::stoi(value["ErrorCode"].asString()); if(!value["Message"].isNull()) diff --git a/aliyuncvc/src/model/JoinMeetingRequest.cc b/aliyuncvc/src/model/JoinMeetingRequest.cc index c9ce285b7..e1e9fa364 100644 --- a/aliyuncvc/src/model/JoinMeetingRequest.cc +++ b/aliyuncvc/src/model/JoinMeetingRequest.cc @@ -27,17 +27,6 @@ JoinMeetingRequest::JoinMeetingRequest() : JoinMeetingRequest::~JoinMeetingRequest() {} -std::string JoinMeetingRequest::getMeetingCode()const -{ - return meetingCode_; -} - -void JoinMeetingRequest::setMeetingCode(const std::string& meetingCode) -{ - meetingCode_ = meetingCode; - setCoreParameter("MeetingCode", meetingCode); -} - std::string JoinMeetingRequest::getUserId()const { return userId_; @@ -49,3 +38,14 @@ void JoinMeetingRequest::setUserId(const std::string& userId) setCoreParameter("UserId", userId); } +std::string JoinMeetingRequest::getMeetingCode()const +{ + return meetingCode_; +} + +void JoinMeetingRequest::setMeetingCode(const std::string& meetingCode) +{ + meetingCode_ = meetingCode; + setCoreParameter("MeetingCode", meetingCode); +} + diff --git a/aliyuncvc/src/model/ListIsvStatisticsRequest.cc b/aliyuncvc/src/model/ListIsvStatisticsRequest.cc new file mode 100644 index 000000000..7263dc3f4 --- /dev/null +++ b/aliyuncvc/src/model/ListIsvStatisticsRequest.cc @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::Aliyuncvc::Model::ListIsvStatisticsRequest; + +ListIsvStatisticsRequest::ListIsvStatisticsRequest() : + RpcServiceRequest("aliyuncvc", "2019-10-30", "ListIsvStatistics") +{ + setMethod(HttpRequest::Method::Post); +} + +ListIsvStatisticsRequest::~ListIsvStatisticsRequest() +{} + +long ListIsvStatisticsRequest::getEndTime()const +{ + return endTime_; +} + +void ListIsvStatisticsRequest::setEndTime(long endTime) +{ + endTime_ = endTime; + setCoreParameter("EndTime", std::to_string(endTime)); +} + +long ListIsvStatisticsRequest::getStartTime()const +{ + return startTime_; +} + +void ListIsvStatisticsRequest::setStartTime(long startTime) +{ + startTime_ = startTime; + setCoreParameter("StartTime", std::to_string(startTime)); +} + diff --git a/aliyuncvc/src/model/ListIsvStatisticsResult.cc b/aliyuncvc/src/model/ListIsvStatisticsResult.cc new file mode 100644 index 000000000..b3e82f07d --- /dev/null +++ b/aliyuncvc/src/model/ListIsvStatisticsResult.cc @@ -0,0 +1,92 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::Aliyuncvc; +using namespace AlibabaCloud::Aliyuncvc::Model; + +ListIsvStatisticsResult::ListIsvStatisticsResult() : + ServiceResult() +{} + +ListIsvStatisticsResult::ListIsvStatisticsResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +ListIsvStatisticsResult::~ListIsvStatisticsResult() +{} + +void ListIsvStatisticsResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + auto dataNode = value["Data"]; + auto allStatisticsNode = dataNode["Statistics"]["Statistic"]; + for (auto dataNodeStatisticsStatistic : allStatisticsNode) + { + Data::Statistic statisticObject; + if(!dataNodeStatisticsStatistic["MeetingNumber"].isNull()) + statisticObject.meetingNumber = dataNodeStatisticsStatistic["MeetingNumber"].asString(); + if(!dataNodeStatisticsStatistic["MeetingLength"].isNull()) + statisticObject.meetingLength = dataNodeStatisticsStatistic["MeetingLength"].asString(); + if(!dataNodeStatisticsStatistic["MemberNumber"].isNull()) + statisticObject.memberNumber = dataNodeStatisticsStatistic["MemberNumber"].asString(); + if(!dataNodeStatisticsStatistic["Day"].isNull()) + statisticObject.day = dataNodeStatisticsStatistic["Day"].asString(); + data_.statistics.push_back(statisticObject); + } + auto totalNode = dataNode["Total"]; + if(!totalNode["MeetingNumber"].isNull()) + data_.total.meetingNumber = std::stoi(totalNode["MeetingNumber"].asString()); + if(!totalNode["MeetingLength"].isNull()) + data_.total.meetingLength = std::stoi(totalNode["MeetingLength"].asString()); + if(!totalNode["MemberNumber"].isNull()) + data_.total.memberNumber = std::stoi(totalNode["MemberNumber"].asString()); + if(!value["ErrorCode"].isNull()) + errorCode_ = std::stoi(value["ErrorCode"].asString()); + if(!value["Message"].isNull()) + message_ = value["Message"].asString(); + if(!value["Success"].isNull()) + success_ = value["Success"].asString() == "true"; + +} + +std::string ListIsvStatisticsResult::getMessage()const +{ + return message_; +} + +ListIsvStatisticsResult::Data ListIsvStatisticsResult::getData()const +{ + return data_; +} + +int ListIsvStatisticsResult::getErrorCode()const +{ + return errorCode_; +} + +bool ListIsvStatisticsResult::getSuccess()const +{ + return success_; +} + diff --git a/aliyuncvc/src/model/ListUsersRequest.cc b/aliyuncvc/src/model/ListUsersRequest.cc index d9396deb1..19751f536 100644 --- a/aliyuncvc/src/model/ListUsersRequest.cc +++ b/aliyuncvc/src/model/ListUsersRequest.cc @@ -27,17 +27,6 @@ ListUsersRequest::ListUsersRequest() : ListUsersRequest::~ListUsersRequest() {} -int ListUsersRequest::getPageSize()const -{ - return pageSize_; -} - -void ListUsersRequest::setPageSize(int pageSize) -{ - pageSize_ = pageSize; - setCoreParameter("PageSize", std::to_string(pageSize)); -} - int ListUsersRequest::getPageNumber()const { return pageNumber_; @@ -49,3 +38,14 @@ void ListUsersRequest::setPageNumber(int pageNumber) setCoreParameter("PageNumber", std::to_string(pageNumber)); } +int ListUsersRequest::getPageSize()const +{ + return pageSize_; +} + +void ListUsersRequest::setPageSize(int pageSize) +{ + pageSize_ = pageSize; + setCoreParameter("PageSize", std::to_string(pageSize)); +} + diff --git a/aliyuncvc/src/model/ListUsersResult.cc b/aliyuncvc/src/model/ListUsersResult.cc index 4fa3585f7..d2836436f 100644 --- a/aliyuncvc/src/model/ListUsersResult.cc +++ b/aliyuncvc/src/model/ListUsersResult.cc @@ -70,6 +70,8 @@ void ListUsersResult::parse(const std::string &payload) userInfoObject.userMobile = dataNodeUserInfosUserInfo["UserMobile"].asString(); if(!dataNodeUserInfosUserInfo["UserAvatarUrl"].isNull()) userInfoObject.userAvatarUrl = dataNodeUserInfosUserInfo["UserAvatarUrl"].asString(); + if(!dataNodeUserInfosUserInfo["JobName"].isNull()) + userInfoObject.jobName = dataNodeUserInfosUserInfo["JobName"].asString(); data_.userInfos.push_back(userInfoObject); } if(!value["ErrorCode"].isNull())