diff --git a/CHANGELOG b/CHANGELOG index 5cd73130b..fbbb00d54 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-06-04 Version: 1.36.446 +- Update monitor related API. + 2020-06-03 Version: 1.36.445 - Describe describeAvailableResource. diff --git a/VERSION b/VERSION index 5c9e226ce..cfadbc255 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.445 \ No newline at end of file +1.36.446 \ No newline at end of file diff --git a/vcs/include/alibabacloud/vcs/model/AddMonitorResult.h b/vcs/include/alibabacloud/vcs/model/AddMonitorResult.h index e22c9e7c4..273456394 100644 --- a/vcs/include/alibabacloud/vcs/model/AddMonitorResult.h +++ b/vcs/include/alibabacloud/vcs/model/AddMonitorResult.h @@ -32,20 +32,24 @@ namespace AlibabaCloud class ALIBABACLOUD_VCS_EXPORT AddMonitorResult : public ServiceResult { public: + struct Data + { + std::string taskId; + }; AddMonitorResult(); explicit AddMonitorResult(const std::string &payload); ~AddMonitorResult(); std::string getMessage()const; - std::string getData()const; + Data getData()const; std::string getCode()const; protected: void parse(const std::string &payload); private: std::string message_; - std::string data_; + Data data_; std::string code_; }; diff --git a/vcs/include/alibabacloud/vcs/model/UpdateMonitorRequest.h b/vcs/include/alibabacloud/vcs/model/UpdateMonitorRequest.h index 7654b298a..a13675a9c 100644 --- a/vcs/include/alibabacloud/vcs/model/UpdateMonitorRequest.h +++ b/vcs/include/alibabacloud/vcs/model/UpdateMonitorRequest.h @@ -35,12 +35,8 @@ namespace AlibabaCloud UpdateMonitorRequest(); ~UpdateMonitorRequest(); - std::string getDeviceOperateType()const; - void setDeviceOperateType(const std::string& deviceOperateType); std::string getCorpId()const; void setCorpId(const std::string& corpId); - std::string getPicList()const; - void setPicList(const std::string& picList); std::string getDescription()const; void setDescription(const std::string& description); std::string getRuleName()const; @@ -49,27 +45,34 @@ namespace AlibabaCloud void setPicOperateType(const std::string& picOperateType); std::string getAttributeName()const; void setAttributeName(const std::string& attributeName); + std::string getAttributeOperateType()const; + void setAttributeOperateType(const std::string& attributeOperateType); + std::string getRuleExpression()const; + void setRuleExpression(const std::string& ruleExpression); + std::string getTaskId()const; + void setTaskId(const std::string& taskId); + std::string getDeviceOperateType()const; + void setDeviceOperateType(const std::string& deviceOperateType); + std::string getPicList()const; + void setPicList(const std::string& picList); std::string getAttributeValueList()const; void setAttributeValueList(const std::string& attributeValueList); std::string getDeviceList()const; void setDeviceList(const std::string& deviceList); - std::string getAttributeOperateType()const; - void setAttributeOperateType(const std::string& attributeOperateType); - std::string getTaskId()const; - void setTaskId(const std::string& taskId); private: - std::string deviceOperateType_; std::string corpId_; - std::string picList_; std::string description_; std::string ruleName_; std::string picOperateType_; std::string attributeName_; + std::string attributeOperateType_; + std::string ruleExpression_; + std::string taskId_; + std::string deviceOperateType_; + std::string picList_; std::string attributeValueList_; std::string deviceList_; - std::string attributeOperateType_; - std::string taskId_; }; } diff --git a/vcs/src/model/AddMonitorResult.cc b/vcs/src/model/AddMonitorResult.cc index f4637e651..f277911e1 100644 --- a/vcs/src/model/AddMonitorResult.cc +++ b/vcs/src/model/AddMonitorResult.cc @@ -39,12 +39,13 @@ void AddMonitorResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); + auto dataNode = value["Data"]; + if(!dataNode["TaskId"].isNull()) + data_.taskId = dataNode["TaskId"].asString(); if(!value["Code"].isNull()) code_ = value["Code"].asString(); if(!value["Message"].isNull()) message_ = value["Message"].asString(); - if(!value["Data"].isNull()) - data_ = value["Data"].asString(); } @@ -53,7 +54,7 @@ std::string AddMonitorResult::getMessage()const return message_; } -std::string AddMonitorResult::getData()const +AddMonitorResult::Data AddMonitorResult::getData()const { return data_; } diff --git a/vcs/src/model/UpdateMonitorRequest.cc b/vcs/src/model/UpdateMonitorRequest.cc index 940139fc9..93e149d2b 100644 --- a/vcs/src/model/UpdateMonitorRequest.cc +++ b/vcs/src/model/UpdateMonitorRequest.cc @@ -27,17 +27,6 @@ UpdateMonitorRequest::UpdateMonitorRequest() : UpdateMonitorRequest::~UpdateMonitorRequest() {} -std::string UpdateMonitorRequest::getDeviceOperateType()const -{ - return deviceOperateType_; -} - -void UpdateMonitorRequest::setDeviceOperateType(const std::string& deviceOperateType) -{ - deviceOperateType_ = deviceOperateType; - setBodyParameter("DeviceOperateType", deviceOperateType); -} - std::string UpdateMonitorRequest::getCorpId()const { return corpId_; @@ -49,17 +38,6 @@ void UpdateMonitorRequest::setCorpId(const std::string& corpId) setBodyParameter("CorpId", corpId); } -std::string UpdateMonitorRequest::getPicList()const -{ - return picList_; -} - -void UpdateMonitorRequest::setPicList(const std::string& picList) -{ - picList_ = picList; - setBodyParameter("PicList", picList); -} - std::string UpdateMonitorRequest::getDescription()const { return description_; @@ -104,6 +82,61 @@ void UpdateMonitorRequest::setAttributeName(const std::string& attributeName) setBodyParameter("AttributeName", attributeName); } +std::string UpdateMonitorRequest::getAttributeOperateType()const +{ + return attributeOperateType_; +} + +void UpdateMonitorRequest::setAttributeOperateType(const std::string& attributeOperateType) +{ + attributeOperateType_ = attributeOperateType; + setBodyParameter("AttributeOperateType", attributeOperateType); +} + +std::string UpdateMonitorRequest::getRuleExpression()const +{ + return ruleExpression_; +} + +void UpdateMonitorRequest::setRuleExpression(const std::string& ruleExpression) +{ + ruleExpression_ = ruleExpression; + setBodyParameter("RuleExpression", ruleExpression); +} + +std::string UpdateMonitorRequest::getTaskId()const +{ + return taskId_; +} + +void UpdateMonitorRequest::setTaskId(const std::string& taskId) +{ + taskId_ = taskId; + setBodyParameter("TaskId", taskId); +} + +std::string UpdateMonitorRequest::getDeviceOperateType()const +{ + return deviceOperateType_; +} + +void UpdateMonitorRequest::setDeviceOperateType(const std::string& deviceOperateType) +{ + deviceOperateType_ = deviceOperateType; + setBodyParameter("DeviceOperateType", deviceOperateType); +} + +std::string UpdateMonitorRequest::getPicList()const +{ + return picList_; +} + +void UpdateMonitorRequest::setPicList(const std::string& picList) +{ + picList_ = picList; + setBodyParameter("PicList", picList); +} + std::string UpdateMonitorRequest::getAttributeValueList()const { return attributeValueList_; @@ -126,25 +159,3 @@ void UpdateMonitorRequest::setDeviceList(const std::string& deviceList) setBodyParameter("DeviceList", deviceList); } -std::string UpdateMonitorRequest::getAttributeOperateType()const -{ - return attributeOperateType_; -} - -void UpdateMonitorRequest::setAttributeOperateType(const std::string& attributeOperateType) -{ - attributeOperateType_ = attributeOperateType; - setBodyParameter("AttributeOperateType", attributeOperateType); -} - -std::string UpdateMonitorRequest::getTaskId()const -{ - return taskId_; -} - -void UpdateMonitorRequest::setTaskId(const std::string& taskId) -{ - taskId_ = taskId; - setBodyParameter("TaskId", taskId); -} -