diff --git a/CHANGELOG b/CHANGELOG index 60efc8351..105bd237a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2018-09-03 Version: 1.24.1 +1, Add new service APIļ¼šFindServiceStatisticalData, which can support query service statistical data. + 2018-08-28 Version: 1.24.0 1, Add new APIs for profiling application performance: GetCloudMetricProfiling, etc. 2, Add new APIs to support Shifter container applications: AddContainerApp, etc. diff --git a/VERSION b/VERSION index d43704683..3e940eb72 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.24.0 \ No newline at end of file +1.24.1 \ No newline at end of file diff --git a/csb/CMakeLists.txt b/csb/CMakeLists.txt index 49da34e70..d434c3158 100644 --- a/csb/CMakeLists.txt +++ b/csb/CMakeLists.txt @@ -73,6 +73,8 @@ set(csb_public_header_model include/alibabacloud/csb/model/UpdateOrderListResult.h include/alibabacloud/csb/model/DeleteCredentialsListRequest.h include/alibabacloud/csb/model/DeleteCredentialsListResult.h + include/alibabacloud/csb/model/FindServiceStatisticalDataRequest.h + include/alibabacloud/csb/model/FindServiceStatisticalDataResult.h include/alibabacloud/csb/model/CreateServiceRequest.h include/alibabacloud/csb/model/CreateServiceResult.h include/alibabacloud/csb/model/FindCredentialsListRequest.h @@ -154,6 +156,8 @@ set(csb_src src/model/UpdateOrderListResult.cc src/model/DeleteCredentialsListRequest.cc src/model/DeleteCredentialsListResult.cc + src/model/FindServiceStatisticalDataRequest.cc + src/model/FindServiceStatisticalDataResult.cc src/model/CreateServiceRequest.cc src/model/CreateServiceResult.cc src/model/FindCredentialsListRequest.cc diff --git a/csb/include/alibabacloud/csb/CSBClient.h b/csb/include/alibabacloud/csb/CSBClient.h index 3a7cbb41e..cbfc76e2b 100644 --- a/csb/include/alibabacloud/csb/CSBClient.h +++ b/csb/include/alibabacloud/csb/CSBClient.h @@ -74,6 +74,8 @@ #include "model/UpdateOrderListResult.h" #include "model/DeleteCredentialsListRequest.h" #include "model/DeleteCredentialsListResult.h" +#include "model/FindServiceStatisticalDataRequest.h" +#include "model/FindServiceStatisticalDataResult.h" #include "model/CreateServiceRequest.h" #include "model/CreateServiceResult.h" #include "model/FindCredentialsListRequest.h" @@ -187,6 +189,9 @@ namespace AlibabaCloud typedef Outcome DeleteCredentialsListOutcome; typedef std::future DeleteCredentialsListOutcomeCallable; typedef std::function&)> DeleteCredentialsListAsyncHandler; + typedef Outcome FindServiceStatisticalDataOutcome; + typedef std::future FindServiceStatisticalDataOutcomeCallable; + typedef std::function&)> FindServiceStatisticalDataAsyncHandler; typedef Outcome CreateServiceOutcome; typedef std::future CreateServiceOutcomeCallable; typedef std::function&)> CreateServiceAsyncHandler; @@ -309,6 +314,9 @@ namespace AlibabaCloud DeleteCredentialsListOutcome deleteCredentialsList(const Model::DeleteCredentialsListRequest &request)const; void deleteCredentialsListAsync(const Model::DeleteCredentialsListRequest& request, const DeleteCredentialsListAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DeleteCredentialsListOutcomeCallable deleteCredentialsListCallable(const Model::DeleteCredentialsListRequest& request) const; + FindServiceStatisticalDataOutcome findServiceStatisticalData(const Model::FindServiceStatisticalDataRequest &request)const; + void findServiceStatisticalDataAsync(const Model::FindServiceStatisticalDataRequest& request, const FindServiceStatisticalDataAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + FindServiceStatisticalDataOutcomeCallable findServiceStatisticalDataCallable(const Model::FindServiceStatisticalDataRequest& request) const; CreateServiceOutcome createService(const Model::CreateServiceRequest &request)const; void createServiceAsync(const Model::CreateServiceRequest& request, const CreateServiceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; CreateServiceOutcomeCallable createServiceCallable(const Model::CreateServiceRequest& request) const; diff --git a/csb/include/alibabacloud/csb/model/CheckServiceExistRequest.h b/csb/include/alibabacloud/csb/model/CheckServiceExistRequest.h index c304139dc..137af359a 100644 --- a/csb/include/alibabacloud/csb/model/CheckServiceExistRequest.h +++ b/csb/include/alibabacloud/csb/model/CheckServiceExistRequest.h @@ -35,16 +35,16 @@ namespace AlibabaCloud CheckServiceExistRequest(); ~CheckServiceExistRequest(); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); std::string getServiceName()const; void setServiceName(const std::string& serviceName); private: - long csbId_; std::string regionId_; + long csbId_; std::string serviceName_; }; diff --git a/csb/include/alibabacloud/csb/model/CreateCredentialsRequest.h b/csb/include/alibabacloud/csb/model/CreateCredentialsRequest.h index e39530576..214e26796 100644 --- a/csb/include/alibabacloud/csb/model/CreateCredentialsRequest.h +++ b/csb/include/alibabacloud/csb/model/CreateCredentialsRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - std::string getRegionId()const; - void setRegionId(const std::string& regionId); long getCsbId()const; void setCsbId(long csbId); + std::string getRegionId()const; + void setRegionId(const std::string& regionId); private: std::string data_; - std::string regionId_; long csbId_; + std::string regionId_; }; } diff --git a/csb/include/alibabacloud/csb/model/CreateServiceRequest.h b/csb/include/alibabacloud/csb/model/CreateServiceRequest.h index 9b1c072fa..6a528a224 100644 --- a/csb/include/alibabacloud/csb/model/CreateServiceRequest.h +++ b/csb/include/alibabacloud/csb/model/CreateServiceRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/DeleteProjectListRequest.h b/csb/include/alibabacloud/csb/model/DeleteProjectListRequest.h index af3cbfbc5..1753346d8 100644 --- a/csb/include/alibabacloud/csb/model/DeleteProjectListRequest.h +++ b/csb/include/alibabacloud/csb/model/DeleteProjectListRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/DeleteProjectRequest.h b/csb/include/alibabacloud/csb/model/DeleteProjectRequest.h index e9273da19..ce3f46e45 100644 --- a/csb/include/alibabacloud/csb/model/DeleteProjectRequest.h +++ b/csb/include/alibabacloud/csb/model/DeleteProjectRequest.h @@ -35,16 +35,16 @@ namespace AlibabaCloud DeleteProjectRequest(); ~DeleteProjectRequest(); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); long getProjectId()const; void setProjectId(long projectId); private: - long csbId_; std::string regionId_; + long csbId_; long projectId_; }; diff --git a/csb/include/alibabacloud/csb/model/DeleteServiceListRequest.h b/csb/include/alibabacloud/csb/model/DeleteServiceListRequest.h index 1c53d719a..33d7d7895 100644 --- a/csb/include/alibabacloud/csb/model/DeleteServiceListRequest.h +++ b/csb/include/alibabacloud/csb/model/DeleteServiceListRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/FindApprovalOrderListRequest.h b/csb/include/alibabacloud/csb/model/FindApprovalOrderListRequest.h index d9a0d479f..28777b9ef 100644 --- a/csb/include/alibabacloud/csb/model/FindApprovalOrderListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindApprovalOrderListRequest.h @@ -43,10 +43,10 @@ namespace AlibabaCloud void setAlias(const std::string& alias); std::string getServiceName()const; void setServiceName(const std::string& serviceName); - long getServiceId()const; - void setServiceId(long serviceId); int getPageNum()const; void setPageNum(int pageNum); + long getServiceId()const; + void setServiceId(long serviceId); bool getOnlyPending()const; void setOnlyPending(bool onlyPending); @@ -55,8 +55,8 @@ namespace AlibabaCloud std::string regionId_; std::string alias_; std::string serviceName_; - long serviceId_; int pageNum_; + long serviceId_; bool onlyPending_; }; diff --git a/csb/include/alibabacloud/csb/model/FindApproveServiceListRequest.h b/csb/include/alibabacloud/csb/model/FindApproveServiceListRequest.h index 043759f38..2303be457 100644 --- a/csb/include/alibabacloud/csb/model/FindApproveServiceListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindApproveServiceListRequest.h @@ -35,10 +35,10 @@ namespace AlibabaCloud FindApproveServiceListRequest(); ~FindApproveServiceListRequest(); - std::string getApproveLevel()const; - void setApproveLevel(const std::string& approveLevel); std::string getProjectName()const; void setProjectName(const std::string& projectName); + std::string getApproveLevel()const; + void setApproveLevel(const std::string& approveLevel); bool getShowDelService()const; void setShowDelService(bool showDelService); long getCsbId()const; @@ -51,8 +51,8 @@ namespace AlibabaCloud void setServiceName(const std::string& serviceName); private: - std::string approveLevel_; std::string projectName_; + std::string approveLevel_; bool showDelService_; long csbId_; std::string regionId_; diff --git a/csb/include/alibabacloud/csb/model/FindCredentialsListRequest.h b/csb/include/alibabacloud/csb/model/FindCredentialsListRequest.h index e34045aca..619696ff0 100644 --- a/csb/include/alibabacloud/csb/model/FindCredentialsListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindCredentialsListRequest.h @@ -35,18 +35,18 @@ namespace AlibabaCloud FindCredentialsListRequest(); ~FindCredentialsListRequest(); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); int getPageNum()const; void setPageNum(int pageNum); std::string getGroupName()const; void setGroupName(const std::string& groupName); private: - long csbId_; std::string regionId_; + long csbId_; int pageNum_; std::string groupName_; diff --git a/csb/include/alibabacloud/csb/model/FindInstanceListRequest.h b/csb/include/alibabacloud/csb/model/FindInstanceListRequest.h index 2969b0bd0..391cd034e 100644 --- a/csb/include/alibabacloud/csb/model/FindInstanceListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindInstanceListRequest.h @@ -35,10 +35,10 @@ namespace AlibabaCloud FindInstanceListRequest(); ~FindInstanceListRequest(); - std::string getSearchTxt()const; - void setSearchTxt(const std::string& searchTxt); std::string getRegionId()const; void setRegionId(const std::string& regionId); + std::string getSearchTxt()const; + void setSearchTxt(const std::string& searchTxt); long getCsbId()const; void setCsbId(long csbId); int getPageNum()const; @@ -47,8 +47,8 @@ namespace AlibabaCloud void setStatus(int status); private: - std::string searchTxt_; std::string regionId_; + std::string searchTxt_; long csbId_; int pageNum_; int status_; diff --git a/csb/include/alibabacloud/csb/model/FindProjectListRequest.h b/csb/include/alibabacloud/csb/model/FindProjectListRequest.h index ecb071d21..dd3eb0fca 100644 --- a/csb/include/alibabacloud/csb/model/FindProjectListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindProjectListRequest.h @@ -37,17 +37,17 @@ namespace AlibabaCloud std::string getProjectName()const; void setProjectName(const std::string& projectName); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); int getPageNum()const; void setPageNum(int pageNum); private: std::string projectName_; - long csbId_; std::string regionId_; + long csbId_; int pageNum_; }; diff --git a/csb/include/alibabacloud/csb/model/FindProjectsNameListRequest.h b/csb/include/alibabacloud/csb/model/FindProjectsNameListRequest.h index c0f35fc1f..69711c1b2 100644 --- a/csb/include/alibabacloud/csb/model/FindProjectsNameListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindProjectsNameListRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getOperationFlag()const; void setOperationFlag(const std::string& operationFlag); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string operationFlag_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/FindServiceListRequest.h b/csb/include/alibabacloud/csb/model/FindServiceListRequest.h index abaa82c8b..29045031d 100644 --- a/csb/include/alibabacloud/csb/model/FindServiceListRequest.h +++ b/csb/include/alibabacloud/csb/model/FindServiceListRequest.h @@ -37,10 +37,10 @@ namespace AlibabaCloud std::string getProjectName()const; void setProjectName(const std::string& projectName); - int getCasShowType()const; - void setCasShowType(int casShowType); bool getShowDelService()const; void setShowDelService(bool showDelService); + int getCasShowType()const; + void setCasShowType(int casShowType); long getCsbId()const; void setCsbId(long csbId); std::string getRegionId()const; @@ -54,8 +54,8 @@ namespace AlibabaCloud private: std::string projectName_; - int casShowType_; bool showDelService_; + int casShowType_; long csbId_; std::string regionId_; std::string alias_; diff --git a/csb/include/alibabacloud/csb/model/FindServiceStatisticalDataRequest.h b/csb/include/alibabacloud/csb/model/FindServiceStatisticalDataRequest.h new file mode 100644 index 000000000..9573e5b02 --- /dev/null +++ b/csb/include/alibabacloud/csb/model/FindServiceStatisticalDataRequest.h @@ -0,0 +1,60 @@ +/* + * 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_CSB_MODEL_FINDSERVICESTATISTICALDATAREQUEST_H_ +#define ALIBABACLOUD_CSB_MODEL_FINDSERVICESTATISTICALDATAREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace CSB + { + namespace Model + { + class ALIBABACLOUD_CSB_EXPORT FindServiceStatisticalDataRequest : public RpcServiceRequest + { + + public: + FindServiceStatisticalDataRequest(); + ~FindServiceStatisticalDataRequest(); + + long getCsbId()const; + void setCsbId(long csbId); + std::string getRegionId()const; + void setRegionId(const std::string& regionId); + long getEndTime()const; + void setEndTime(long endTime); + std::string getServiceName()const; + void setServiceName(const std::string& serviceName); + long getStartTime()const; + void setStartTime(long startTime); + + private: + long csbId_; + std::string regionId_; + long endTime_; + std::string serviceName_; + long startTime_; + + }; + } + } +} +#endif // !ALIBABACLOUD_CSB_MODEL_FINDSERVICESTATISTICALDATAREQUEST_H_ \ No newline at end of file diff --git a/csb/include/alibabacloud/csb/model/FindServiceStatisticalDataResult.h b/csb/include/alibabacloud/csb/model/FindServiceStatisticalDataResult.h new file mode 100644 index 000000000..6e124cdf8 --- /dev/null +++ b/csb/include/alibabacloud/csb/model/FindServiceStatisticalDataResult.h @@ -0,0 +1,76 @@ +/* + * 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_CSB_MODEL_FINDSERVICESTATISTICALDATARESULT_H_ +#define ALIBABACLOUD_CSB_MODEL_FINDSERVICESTATISTICALDATARESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace CSB + { + namespace Model + { + class ALIBABACLOUD_CSB_EXPORT FindServiceStatisticalDataResult : public ServiceResult + { + public: + struct Data + { + struct ServiceStatisticData + { + struct Total + { + int total; + int errorNum; + }; + std::string serviceName; + std::string userId; + Total total; + float minRt; + long requestTime; + float maxRt; + float avgRt; + }; + int currentPage; + int pageNumber; + std::vector monitorStatisticData; + }; + + + FindServiceStatisticalDataResult(); + explicit FindServiceStatisticalDataResult(const std::string &payload); + ~FindServiceStatisticalDataResult(); + std::string getMessage()const; + Data getData()const; + int getCode()const; + + protected: + void parse(const std::string &payload); + private: + std::string message_; + Data data_; + int code_; + + }; + } + } +} +#endif // !ALIBABACLOUD_CSB_MODEL_FINDSERVICESTATISTICALDATARESULT_H_ \ No newline at end of file diff --git a/csb/include/alibabacloud/csb/model/GetOrderRequest.h b/csb/include/alibabacloud/csb/model/GetOrderRequest.h index a1e4a0906..0169a5367 100644 --- a/csb/include/alibabacloud/csb/model/GetOrderRequest.h +++ b/csb/include/alibabacloud/csb/model/GetOrderRequest.h @@ -35,16 +35,16 @@ namespace AlibabaCloud GetOrderRequest(); ~GetOrderRequest(); - long getOrderId()const; - void setOrderId(long orderId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getOrderId()const; + void setOrderId(long orderId); std::string getServiceName()const; void setServiceName(const std::string& serviceName); private: - long orderId_; std::string regionId_; + long orderId_; std::string serviceName_; }; diff --git a/csb/include/alibabacloud/csb/model/GetProjectRequest.h b/csb/include/alibabacloud/csb/model/GetProjectRequest.h index e0dbae995..5479f1533 100644 --- a/csb/include/alibabacloud/csb/model/GetProjectRequest.h +++ b/csb/include/alibabacloud/csb/model/GetProjectRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getProjectName()const; void setProjectName(const std::string& projectName); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string projectName_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/GetServiceRequest.h b/csb/include/alibabacloud/csb/model/GetServiceRequest.h index 847173a05..3f11b19ed 100644 --- a/csb/include/alibabacloud/csb/model/GetServiceRequest.h +++ b/csb/include/alibabacloud/csb/model/GetServiceRequest.h @@ -35,16 +35,16 @@ namespace AlibabaCloud GetServiceRequest(); ~GetServiceRequest(); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); long getServiceId()const; void setServiceId(long serviceId); private: - long csbId_; std::string regionId_; + long csbId_; long serviceId_; }; diff --git a/csb/include/alibabacloud/csb/model/UpdateOrderRequest.h b/csb/include/alibabacloud/csb/model/UpdateOrderRequest.h index 250eedaad..25ea38ce3 100644 --- a/csb/include/alibabacloud/csb/model/UpdateOrderRequest.h +++ b/csb/include/alibabacloud/csb/model/UpdateOrderRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/UpdateProjectListStatusRequest.h b/csb/include/alibabacloud/csb/model/UpdateProjectListStatusRequest.h index eff6b5a48..02c396040 100644 --- a/csb/include/alibabacloud/csb/model/UpdateProjectListStatusRequest.h +++ b/csb/include/alibabacloud/csb/model/UpdateProjectListStatusRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/UpdateProjectRequest.h b/csb/include/alibabacloud/csb/model/UpdateProjectRequest.h index 581ecd571..3deb1faf1 100644 --- a/csb/include/alibabacloud/csb/model/UpdateProjectRequest.h +++ b/csb/include/alibabacloud/csb/model/UpdateProjectRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/UpdateServiceListStatusRequest.h b/csb/include/alibabacloud/csb/model/UpdateServiceListStatusRequest.h index 542c6a753..91d02a2fe 100644 --- a/csb/include/alibabacloud/csb/model/UpdateServiceListStatusRequest.h +++ b/csb/include/alibabacloud/csb/model/UpdateServiceListStatusRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/include/alibabacloud/csb/model/UpdateServiceQPSRequest.h b/csb/include/alibabacloud/csb/model/UpdateServiceQPSRequest.h index 8d262990a..6a0731a28 100644 --- a/csb/include/alibabacloud/csb/model/UpdateServiceQPSRequest.h +++ b/csb/include/alibabacloud/csb/model/UpdateServiceQPSRequest.h @@ -35,16 +35,16 @@ namespace AlibabaCloud UpdateServiceQPSRequest(); ~UpdateServiceQPSRequest(); - std::string getQps()const; - void setQps(const std::string& qps); std::string getRegionId()const; void setRegionId(const std::string& regionId); + std::string getQps()const; + void setQps(const std::string& qps); long getServiceId()const; void setServiceId(long serviceId); private: - std::string qps_; std::string regionId_; + std::string qps_; long serviceId_; }; diff --git a/csb/include/alibabacloud/csb/model/UpdateServiceRequest.h b/csb/include/alibabacloud/csb/model/UpdateServiceRequest.h index 3166c965a..60fa680a9 100644 --- a/csb/include/alibabacloud/csb/model/UpdateServiceRequest.h +++ b/csb/include/alibabacloud/csb/model/UpdateServiceRequest.h @@ -37,15 +37,15 @@ namespace AlibabaCloud std::string getData()const; void setData(const std::string& data); - long getCsbId()const; - void setCsbId(long csbId); std::string getRegionId()const; void setRegionId(const std::string& regionId); + long getCsbId()const; + void setCsbId(long csbId); private: std::string data_; - long csbId_; std::string regionId_; + long csbId_; }; } diff --git a/csb/src/CSBClient.cc b/csb/src/CSBClient.cc index 6b207b2ee..ce324d488 100644 --- a/csb/src/CSBClient.cc +++ b/csb/src/CSBClient.cc @@ -31,21 +31,21 @@ CSBClient::CSBClient(const Credentials &credentials, const ClientConfiguration & RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "CSB"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } CSBClient::CSBClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "CSB"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } CSBClient::CSBClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "CSB"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } CSBClient::~CSBClient() @@ -987,6 +987,42 @@ CSBClient::DeleteCredentialsListOutcomeCallable CSBClient::deleteCredentialsList return task->get_future(); } +CSBClient::FindServiceStatisticalDataOutcome CSBClient::findServiceStatisticalData(const FindServiceStatisticalDataRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return FindServiceStatisticalDataOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return FindServiceStatisticalDataOutcome(FindServiceStatisticalDataResult(outcome.result())); + else + return FindServiceStatisticalDataOutcome(outcome.error()); +} + +void CSBClient::findServiceStatisticalDataAsync(const FindServiceStatisticalDataRequest& request, const FindServiceStatisticalDataAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, findServiceStatisticalData(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +CSBClient::FindServiceStatisticalDataOutcomeCallable CSBClient::findServiceStatisticalDataCallable(const FindServiceStatisticalDataRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->findServiceStatisticalData(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + CSBClient::CreateServiceOutcome CSBClient::createService(const CreateServiceRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/csb/src/model/CheckServiceExistRequest.cc b/csb/src/model/CheckServiceExistRequest.cc index 59797a29b..b753ed175 100644 --- a/csb/src/model/CheckServiceExistRequest.cc +++ b/csb/src/model/CheckServiceExistRequest.cc @@ -25,17 +25,6 @@ CheckServiceExistRequest::CheckServiceExistRequest() : CheckServiceExistRequest::~CheckServiceExistRequest() {} -long CheckServiceExistRequest::getCsbId()const -{ - return csbId_; -} - -void CheckServiceExistRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string CheckServiceExistRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void CheckServiceExistRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long CheckServiceExistRequest::getCsbId()const +{ + return csbId_; +} + +void CheckServiceExistRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + std::string CheckServiceExistRequest::getServiceName()const { return serviceName_; diff --git a/csb/src/model/CreateCredentialsRequest.cc b/csb/src/model/CreateCredentialsRequest.cc index e81abacf1..2230b1d53 100644 --- a/csb/src/model/CreateCredentialsRequest.cc +++ b/csb/src/model/CreateCredentialsRequest.cc @@ -36,17 +36,6 @@ void CreateCredentialsRequest::setData(const std::string& data) setParameter("Data", data); } -std::string CreateCredentialsRequest::getRegionId()const -{ - return regionId_; -} - -void CreateCredentialsRequest::setRegionId(const std::string& regionId) -{ - regionId_ = regionId; - setParameter("RegionId", regionId); -} - long CreateCredentialsRequest::getCsbId()const { return csbId_; @@ -58,3 +47,14 @@ void CreateCredentialsRequest::setCsbId(long csbId) setParameter("CsbId", std::to_string(csbId)); } +std::string CreateCredentialsRequest::getRegionId()const +{ + return regionId_; +} + +void CreateCredentialsRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + diff --git a/csb/src/model/CreateServiceRequest.cc b/csb/src/model/CreateServiceRequest.cc index b31a8584a..f94b9b169 100644 --- a/csb/src/model/CreateServiceRequest.cc +++ b/csb/src/model/CreateServiceRequest.cc @@ -36,17 +36,6 @@ void CreateServiceRequest::setData(const std::string& data) setParameter("Data", data); } -long CreateServiceRequest::getCsbId()const -{ - return csbId_; -} - -void CreateServiceRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string CreateServiceRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void CreateServiceRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long CreateServiceRequest::getCsbId()const +{ + return csbId_; +} + +void CreateServiceRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/DeleteProjectListRequest.cc b/csb/src/model/DeleteProjectListRequest.cc index 85c3fa09b..ea6b60c86 100644 --- a/csb/src/model/DeleteProjectListRequest.cc +++ b/csb/src/model/DeleteProjectListRequest.cc @@ -36,17 +36,6 @@ void DeleteProjectListRequest::setData(const std::string& data) setParameter("Data", data); } -long DeleteProjectListRequest::getCsbId()const -{ - return csbId_; -} - -void DeleteProjectListRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string DeleteProjectListRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void DeleteProjectListRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long DeleteProjectListRequest::getCsbId()const +{ + return csbId_; +} + +void DeleteProjectListRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/DeleteProjectRequest.cc b/csb/src/model/DeleteProjectRequest.cc index 6c76ad59a..fd1a2e493 100644 --- a/csb/src/model/DeleteProjectRequest.cc +++ b/csb/src/model/DeleteProjectRequest.cc @@ -25,17 +25,6 @@ DeleteProjectRequest::DeleteProjectRequest() : DeleteProjectRequest::~DeleteProjectRequest() {} -long DeleteProjectRequest::getCsbId()const -{ - return csbId_; -} - -void DeleteProjectRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string DeleteProjectRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void DeleteProjectRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long DeleteProjectRequest::getCsbId()const +{ + return csbId_; +} + +void DeleteProjectRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + long DeleteProjectRequest::getProjectId()const { return projectId_; diff --git a/csb/src/model/DeleteServiceListRequest.cc b/csb/src/model/DeleteServiceListRequest.cc index 290748f62..357ba842a 100644 --- a/csb/src/model/DeleteServiceListRequest.cc +++ b/csb/src/model/DeleteServiceListRequest.cc @@ -36,17 +36,6 @@ void DeleteServiceListRequest::setData(const std::string& data) setParameter("Data", data); } -long DeleteServiceListRequest::getCsbId()const -{ - return csbId_; -} - -void DeleteServiceListRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string DeleteServiceListRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void DeleteServiceListRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long DeleteServiceListRequest::getCsbId()const +{ + return csbId_; +} + +void DeleteServiceListRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/FindApprovalOrderListRequest.cc b/csb/src/model/FindApprovalOrderListRequest.cc index 4b9e7c811..0446eb204 100644 --- a/csb/src/model/FindApprovalOrderListRequest.cc +++ b/csb/src/model/FindApprovalOrderListRequest.cc @@ -69,17 +69,6 @@ void FindApprovalOrderListRequest::setServiceName(const std::string& serviceName setParameter("ServiceName", serviceName); } -long FindApprovalOrderListRequest::getServiceId()const -{ - return serviceId_; -} - -void FindApprovalOrderListRequest::setServiceId(long serviceId) -{ - serviceId_ = serviceId; - setParameter("ServiceId", std::to_string(serviceId)); -} - int FindApprovalOrderListRequest::getPageNum()const { return pageNum_; @@ -91,6 +80,17 @@ void FindApprovalOrderListRequest::setPageNum(int pageNum) setParameter("PageNum", std::to_string(pageNum)); } +long FindApprovalOrderListRequest::getServiceId()const +{ + return serviceId_; +} + +void FindApprovalOrderListRequest::setServiceId(long serviceId) +{ + serviceId_ = serviceId; + setParameter("ServiceId", std::to_string(serviceId)); +} + bool FindApprovalOrderListRequest::getOnlyPending()const { return onlyPending_; diff --git a/csb/src/model/FindApproveServiceListRequest.cc b/csb/src/model/FindApproveServiceListRequest.cc index e9efda601..7d3593045 100644 --- a/csb/src/model/FindApproveServiceListRequest.cc +++ b/csb/src/model/FindApproveServiceListRequest.cc @@ -25,17 +25,6 @@ FindApproveServiceListRequest::FindApproveServiceListRequest() : FindApproveServiceListRequest::~FindApproveServiceListRequest() {} -std::string FindApproveServiceListRequest::getApproveLevel()const -{ - return approveLevel_; -} - -void FindApproveServiceListRequest::setApproveLevel(const std::string& approveLevel) -{ - approveLevel_ = approveLevel; - setParameter("ApproveLevel", approveLevel); -} - std::string FindApproveServiceListRequest::getProjectName()const { return projectName_; @@ -47,6 +36,17 @@ void FindApproveServiceListRequest::setProjectName(const std::string& projectNam setParameter("ProjectName", projectName); } +std::string FindApproveServiceListRequest::getApproveLevel()const +{ + return approveLevel_; +} + +void FindApproveServiceListRequest::setApproveLevel(const std::string& approveLevel) +{ + approveLevel_ = approveLevel; + setParameter("ApproveLevel", approveLevel); +} + bool FindApproveServiceListRequest::getShowDelService()const { return showDelService_; diff --git a/csb/src/model/FindCredentialsListRequest.cc b/csb/src/model/FindCredentialsListRequest.cc index 7d751c419..2b5cb5843 100644 --- a/csb/src/model/FindCredentialsListRequest.cc +++ b/csb/src/model/FindCredentialsListRequest.cc @@ -25,17 +25,6 @@ FindCredentialsListRequest::FindCredentialsListRequest() : FindCredentialsListRequest::~FindCredentialsListRequest() {} -long FindCredentialsListRequest::getCsbId()const -{ - return csbId_; -} - -void FindCredentialsListRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string FindCredentialsListRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void FindCredentialsListRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long FindCredentialsListRequest::getCsbId()const +{ + return csbId_; +} + +void FindCredentialsListRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + int FindCredentialsListRequest::getPageNum()const { return pageNum_; diff --git a/csb/src/model/FindInstanceListRequest.cc b/csb/src/model/FindInstanceListRequest.cc index 98dccc0a8..200c45504 100644 --- a/csb/src/model/FindInstanceListRequest.cc +++ b/csb/src/model/FindInstanceListRequest.cc @@ -25,17 +25,6 @@ FindInstanceListRequest::FindInstanceListRequest() : FindInstanceListRequest::~FindInstanceListRequest() {} -std::string FindInstanceListRequest::getSearchTxt()const -{ - return searchTxt_; -} - -void FindInstanceListRequest::setSearchTxt(const std::string& searchTxt) -{ - searchTxt_ = searchTxt; - setParameter("SearchTxt", searchTxt); -} - std::string FindInstanceListRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void FindInstanceListRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +std::string FindInstanceListRequest::getSearchTxt()const +{ + return searchTxt_; +} + +void FindInstanceListRequest::setSearchTxt(const std::string& searchTxt) +{ + searchTxt_ = searchTxt; + setParameter("SearchTxt", searchTxt); +} + long FindInstanceListRequest::getCsbId()const { return csbId_; diff --git a/csb/src/model/FindProjectListRequest.cc b/csb/src/model/FindProjectListRequest.cc index 152c5b4fd..e339d2f98 100644 --- a/csb/src/model/FindProjectListRequest.cc +++ b/csb/src/model/FindProjectListRequest.cc @@ -36,17 +36,6 @@ void FindProjectListRequest::setProjectName(const std::string& projectName) setParameter("ProjectName", projectName); } -long FindProjectListRequest::getCsbId()const -{ - return csbId_; -} - -void FindProjectListRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string FindProjectListRequest::getRegionId()const { return regionId_; @@ -58,6 +47,17 @@ void FindProjectListRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long FindProjectListRequest::getCsbId()const +{ + return csbId_; +} + +void FindProjectListRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + int FindProjectListRequest::getPageNum()const { return pageNum_; diff --git a/csb/src/model/FindProjectsNameListRequest.cc b/csb/src/model/FindProjectsNameListRequest.cc index 5da709cbf..55e578e62 100644 --- a/csb/src/model/FindProjectsNameListRequest.cc +++ b/csb/src/model/FindProjectsNameListRequest.cc @@ -36,17 +36,6 @@ void FindProjectsNameListRequest::setOperationFlag(const std::string& operationF setParameter("OperationFlag", operationFlag); } -long FindProjectsNameListRequest::getCsbId()const -{ - return csbId_; -} - -void FindProjectsNameListRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string FindProjectsNameListRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void FindProjectsNameListRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long FindProjectsNameListRequest::getCsbId()const +{ + return csbId_; +} + +void FindProjectsNameListRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/FindServiceListRequest.cc b/csb/src/model/FindServiceListRequest.cc index fab9c7402..f8b1a05bb 100644 --- a/csb/src/model/FindServiceListRequest.cc +++ b/csb/src/model/FindServiceListRequest.cc @@ -36,17 +36,6 @@ void FindServiceListRequest::setProjectName(const std::string& projectName) setParameter("ProjectName", projectName); } -int FindServiceListRequest::getCasShowType()const -{ - return casShowType_; -} - -void FindServiceListRequest::setCasShowType(int casShowType) -{ - casShowType_ = casShowType; - setParameter("CasShowType", std::to_string(casShowType)); -} - bool FindServiceListRequest::getShowDelService()const { return showDelService_; @@ -58,6 +47,17 @@ void FindServiceListRequest::setShowDelService(bool showDelService) setParameter("ShowDelService", std::to_string(showDelService)); } +int FindServiceListRequest::getCasShowType()const +{ + return casShowType_; +} + +void FindServiceListRequest::setCasShowType(int casShowType) +{ + casShowType_ = casShowType; + setParameter("CasShowType", std::to_string(casShowType)); +} + long FindServiceListRequest::getCsbId()const { return csbId_; diff --git a/csb/src/model/FindServiceStatisticalDataRequest.cc b/csb/src/model/FindServiceStatisticalDataRequest.cc new file mode 100644 index 000000000..0fe16d73a --- /dev/null +++ b/csb/src/model/FindServiceStatisticalDataRequest.cc @@ -0,0 +1,82 @@ +/* + * 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::CSB::Model::FindServiceStatisticalDataRequest; + +FindServiceStatisticalDataRequest::FindServiceStatisticalDataRequest() : + RpcServiceRequest("csb", "2017-11-18", "FindServiceStatisticalData") +{} + +FindServiceStatisticalDataRequest::~FindServiceStatisticalDataRequest() +{} + +long FindServiceStatisticalDataRequest::getCsbId()const +{ + return csbId_; +} + +void FindServiceStatisticalDataRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + +std::string FindServiceStatisticalDataRequest::getRegionId()const +{ + return regionId_; +} + +void FindServiceStatisticalDataRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + +long FindServiceStatisticalDataRequest::getEndTime()const +{ + return endTime_; +} + +void FindServiceStatisticalDataRequest::setEndTime(long endTime) +{ + endTime_ = endTime; + setParameter("EndTime", std::to_string(endTime)); +} + +std::string FindServiceStatisticalDataRequest::getServiceName()const +{ + return serviceName_; +} + +void FindServiceStatisticalDataRequest::setServiceName(const std::string& serviceName) +{ + serviceName_ = serviceName; + setParameter("ServiceName", serviceName); +} + +long FindServiceStatisticalDataRequest::getStartTime()const +{ + return startTime_; +} + +void FindServiceStatisticalDataRequest::setStartTime(long startTime) +{ + startTime_ = startTime; + setParameter("StartTime", std::to_string(startTime)); +} + diff --git a/csb/src/model/FindServiceStatisticalDataResult.cc b/csb/src/model/FindServiceStatisticalDataResult.cc new file mode 100644 index 000000000..696d29ba7 --- /dev/null +++ b/csb/src/model/FindServiceStatisticalDataResult.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::CSB; +using namespace AlibabaCloud::CSB::Model; + +FindServiceStatisticalDataResult::FindServiceStatisticalDataResult() : + ServiceResult() +{} + +FindServiceStatisticalDataResult::FindServiceStatisticalDataResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +FindServiceStatisticalDataResult::~FindServiceStatisticalDataResult() +{} + +void FindServiceStatisticalDataResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + + setRequestId(value["RequestId"].asString()); + auto dataNode = value["Data"]; + if(!dataNode["CurrentPage"].isNull()) + data_.currentPage = std::stoi(dataNode["CurrentPage"].asString()); + if(!dataNode["PageNumber"].isNull()) + data_.pageNumber = std::stoi(dataNode["PageNumber"].asString()); + auto allMonitorStatisticData = value["MonitorStatisticData"]["ServiceStatisticData"]; + for (auto value : allMonitorStatisticData) + { + Data::ServiceStatisticData serviceStatisticDataObject; + if(!value["AvgRt"].isNull()) + serviceStatisticDataObject.avgRt = std::stof(value["AvgRt"].asString()); + if(!value["MaxRt"].isNull()) + serviceStatisticDataObject.maxRt = std::stof(value["MaxRt"].asString()); + if(!value["MinRt"].isNull()) + serviceStatisticDataObject.minRt = std::stof(value["MinRt"].asString()); + if(!value["RequestTime"].isNull()) + serviceStatisticDataObject.requestTime = std::stol(value["RequestTime"].asString()); + if(!value["ServiceName"].isNull()) + serviceStatisticDataObject.serviceName = value["ServiceName"].asString(); + if(!value["UserId"].isNull()) + serviceStatisticDataObject.userId = value["UserId"].asString(); + auto totalNode = value["Total"]; + if(!totalNode["ErrorNum"].isNull()) + serviceStatisticDataObject.total.errorNum = std::stoi(totalNode["ErrorNum"].asString()); + if(!totalNode["Total"].isNull()) + serviceStatisticDataObject.total.total = std::stoi(totalNode["Total"].asString()); + data_.monitorStatisticData.push_back(serviceStatisticDataObject); + } + if(!value["Code"].isNull()) + code_ = std::stoi(value["Code"].asString()); + if(!value["Message"].isNull()) + message_ = value["Message"].asString(); + +} + +std::string FindServiceStatisticalDataResult::getMessage()const +{ + return message_; +} + +FindServiceStatisticalDataResult::Data FindServiceStatisticalDataResult::getData()const +{ + return data_; +} + +int FindServiceStatisticalDataResult::getCode()const +{ + return code_; +} + diff --git a/csb/src/model/GetOrderRequest.cc b/csb/src/model/GetOrderRequest.cc index c9ee3955c..44ed46425 100644 --- a/csb/src/model/GetOrderRequest.cc +++ b/csb/src/model/GetOrderRequest.cc @@ -25,17 +25,6 @@ GetOrderRequest::GetOrderRequest() : GetOrderRequest::~GetOrderRequest() {} -long GetOrderRequest::getOrderId()const -{ - return orderId_; -} - -void GetOrderRequest::setOrderId(long orderId) -{ - orderId_ = orderId; - setParameter("OrderId", std::to_string(orderId)); -} - std::string GetOrderRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void GetOrderRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long GetOrderRequest::getOrderId()const +{ + return orderId_; +} + +void GetOrderRequest::setOrderId(long orderId) +{ + orderId_ = orderId; + setParameter("OrderId", std::to_string(orderId)); +} + std::string GetOrderRequest::getServiceName()const { return serviceName_; diff --git a/csb/src/model/GetProjectRequest.cc b/csb/src/model/GetProjectRequest.cc index e4e91a505..5ca38e37b 100644 --- a/csb/src/model/GetProjectRequest.cc +++ b/csb/src/model/GetProjectRequest.cc @@ -36,17 +36,6 @@ void GetProjectRequest::setProjectName(const std::string& projectName) setParameter("ProjectName", projectName); } -long GetProjectRequest::getCsbId()const -{ - return csbId_; -} - -void GetProjectRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string GetProjectRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void GetProjectRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long GetProjectRequest::getCsbId()const +{ + return csbId_; +} + +void GetProjectRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/GetServiceRequest.cc b/csb/src/model/GetServiceRequest.cc index 959b5656f..880320306 100644 --- a/csb/src/model/GetServiceRequest.cc +++ b/csb/src/model/GetServiceRequest.cc @@ -25,17 +25,6 @@ GetServiceRequest::GetServiceRequest() : GetServiceRequest::~GetServiceRequest() {} -long GetServiceRequest::getCsbId()const -{ - return csbId_; -} - -void GetServiceRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string GetServiceRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void GetServiceRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long GetServiceRequest::getCsbId()const +{ + return csbId_; +} + +void GetServiceRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + long GetServiceRequest::getServiceId()const { return serviceId_; diff --git a/csb/src/model/UpdateOrderRequest.cc b/csb/src/model/UpdateOrderRequest.cc index b34e38b32..9f6d55d35 100644 --- a/csb/src/model/UpdateOrderRequest.cc +++ b/csb/src/model/UpdateOrderRequest.cc @@ -36,17 +36,6 @@ void UpdateOrderRequest::setData(const std::string& data) setParameter("Data", data); } -long UpdateOrderRequest::getCsbId()const -{ - return csbId_; -} - -void UpdateOrderRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string UpdateOrderRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void UpdateOrderRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long UpdateOrderRequest::getCsbId()const +{ + return csbId_; +} + +void UpdateOrderRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/UpdateProjectListStatusRequest.cc b/csb/src/model/UpdateProjectListStatusRequest.cc index 134d8096c..a2462a19f 100644 --- a/csb/src/model/UpdateProjectListStatusRequest.cc +++ b/csb/src/model/UpdateProjectListStatusRequest.cc @@ -36,17 +36,6 @@ void UpdateProjectListStatusRequest::setData(const std::string& data) setParameter("Data", data); } -long UpdateProjectListStatusRequest::getCsbId()const -{ - return csbId_; -} - -void UpdateProjectListStatusRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string UpdateProjectListStatusRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void UpdateProjectListStatusRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long UpdateProjectListStatusRequest::getCsbId()const +{ + return csbId_; +} + +void UpdateProjectListStatusRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/UpdateProjectRequest.cc b/csb/src/model/UpdateProjectRequest.cc index 867c2b953..87805da67 100644 --- a/csb/src/model/UpdateProjectRequest.cc +++ b/csb/src/model/UpdateProjectRequest.cc @@ -36,17 +36,6 @@ void UpdateProjectRequest::setData(const std::string& data) setParameter("Data", data); } -long UpdateProjectRequest::getCsbId()const -{ - return csbId_; -} - -void UpdateProjectRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string UpdateProjectRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void UpdateProjectRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long UpdateProjectRequest::getCsbId()const +{ + return csbId_; +} + +void UpdateProjectRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/UpdateServiceListStatusRequest.cc b/csb/src/model/UpdateServiceListStatusRequest.cc index 76d521a66..d5b868590 100644 --- a/csb/src/model/UpdateServiceListStatusRequest.cc +++ b/csb/src/model/UpdateServiceListStatusRequest.cc @@ -36,17 +36,6 @@ void UpdateServiceListStatusRequest::setData(const std::string& data) setParameter("Data", data); } -long UpdateServiceListStatusRequest::getCsbId()const -{ - return csbId_; -} - -void UpdateServiceListStatusRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string UpdateServiceListStatusRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void UpdateServiceListStatusRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long UpdateServiceListStatusRequest::getCsbId()const +{ + return csbId_; +} + +void UpdateServiceListStatusRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} + diff --git a/csb/src/model/UpdateServiceQPSRequest.cc b/csb/src/model/UpdateServiceQPSRequest.cc index 38a03ba01..a5fbbbabe 100644 --- a/csb/src/model/UpdateServiceQPSRequest.cc +++ b/csb/src/model/UpdateServiceQPSRequest.cc @@ -25,17 +25,6 @@ UpdateServiceQPSRequest::UpdateServiceQPSRequest() : UpdateServiceQPSRequest::~UpdateServiceQPSRequest() {} -std::string UpdateServiceQPSRequest::getQps()const -{ - return qps_; -} - -void UpdateServiceQPSRequest::setQps(const std::string& qps) -{ - qps_ = qps; - setParameter("Qps", qps); -} - std::string UpdateServiceQPSRequest::getRegionId()const { return regionId_; @@ -47,6 +36,17 @@ void UpdateServiceQPSRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +std::string UpdateServiceQPSRequest::getQps()const +{ + return qps_; +} + +void UpdateServiceQPSRequest::setQps(const std::string& qps) +{ + qps_ = qps; + setParameter("Qps", qps); +} + long UpdateServiceQPSRequest::getServiceId()const { return serviceId_; diff --git a/csb/src/model/UpdateServiceRequest.cc b/csb/src/model/UpdateServiceRequest.cc index e6becbd66..0881fd22e 100644 --- a/csb/src/model/UpdateServiceRequest.cc +++ b/csb/src/model/UpdateServiceRequest.cc @@ -36,17 +36,6 @@ void UpdateServiceRequest::setData(const std::string& data) setParameter("Data", data); } -long UpdateServiceRequest::getCsbId()const -{ - return csbId_; -} - -void UpdateServiceRequest::setCsbId(long csbId) -{ - csbId_ = csbId; - setParameter("CsbId", std::to_string(csbId)); -} - std::string UpdateServiceRequest::getRegionId()const { return regionId_; @@ -58,3 +47,14 @@ void UpdateServiceRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } +long UpdateServiceRequest::getCsbId()const +{ + return csbId_; +} + +void UpdateServiceRequest::setCsbId(long csbId) +{ + csbId_ = csbId; + setParameter("CsbId", std::to_string(csbId)); +} +