diff --git a/et-industry-openapi/CMakeLists.txt b/et-industry-openapi/CMakeLists.txt index ab131fc8f..3280d7cc0 100644 --- a/et-industry-openapi/CMakeLists.txt +++ b/et-industry-openapi/CMakeLists.txt @@ -22,16 +22,12 @@ set(et-industry-openapi_public_header set(et-industry-openapi_public_header_model include/alibabacloud/et-industry-openapi/model/UploadDeviceDataRequest.h - include/alibabacloud/et-industry-openapi/model/UploadDeviceDataResult.h - include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCRequest.h - include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCResult.h ) + include/alibabacloud/et-industry-openapi/model/UploadDeviceDataResult.h ) set(et-industry-openapi_src src/Et-industry-openapiClient.cc src/model/UploadDeviceDataRequest.cc - src/model/UploadDeviceDataResult.cc - src/model/UploadDeviceDataDCRequest.cc - src/model/UploadDeviceDataDCResult.cc ) + src/model/UploadDeviceDataResult.cc ) add_library(et-industry-openapi ${LIB_TYPE} ${et-industry-openapi_public_header} diff --git a/et-industry-openapi/include/alibabacloud/et-industry-openapi/Et_industry_openapiClient.h b/et-industry-openapi/include/alibabacloud/et-industry-openapi/Et_industry_openapiClient.h index 4798c7d77..69002e6da 100644 --- a/et-industry-openapi/include/alibabacloud/et-industry-openapi/Et_industry_openapiClient.h +++ b/et-industry-openapi/include/alibabacloud/et-industry-openapi/Et_industry_openapiClient.h @@ -22,10 +22,8 @@ #include #include #include "Et_industry_openapiExport.h" -#include "model/UploadDeviceDataRequest.h" -#include "model/UploadDeviceDataResult.h" -#include "model/UploadDeviceDataDCRequest.h" -#include "model/UploadDeviceDataDCResult.h" +#include "model/UploadDeviceDataRequest.h" +#include "model/UploadDeviceDataResult.h" namespace AlibabaCloud @@ -37,10 +35,7 @@ namespace AlibabaCloud public: typedef Outcome UploadDeviceDataOutcome; typedef std::future UploadDeviceDataOutcomeCallable; - typedef std::function&)> UploadDeviceDataAsyncHandler; - typedef Outcome UploadDeviceDataDCOutcome; - typedef std::future UploadDeviceDataDCOutcomeCallable; - typedef std::function&)> UploadDeviceDataDCAsyncHandler; + typedef std::function&)> UploadDeviceDataAsyncHandler; Et_industry_openapiClient(const Credentials &credentials, const ClientConfiguration &configuration); Et_industry_openapiClient(const std::shared_ptr &credentialsProvider, const ClientConfiguration &configuration); @@ -48,10 +43,7 @@ namespace AlibabaCloud ~Et_industry_openapiClient(); UploadDeviceDataOutcome uploadDeviceData(const Model::UploadDeviceDataRequest &request)const; void uploadDeviceDataAsync(const Model::UploadDeviceDataRequest& request, const UploadDeviceDataAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - UploadDeviceDataOutcomeCallable uploadDeviceDataCallable(const Model::UploadDeviceDataRequest& request) const; - UploadDeviceDataDCOutcome uploadDeviceDataDC(const Model::UploadDeviceDataDCRequest &request)const; - void uploadDeviceDataDCAsync(const Model::UploadDeviceDataDCRequest& request, const UploadDeviceDataDCAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - UploadDeviceDataDCOutcomeCallable uploadDeviceDataDCCallable(const Model::UploadDeviceDataDCRequest& request) const; + UploadDeviceDataOutcomeCallable uploadDeviceDataCallable(const Model::UploadDeviceDataRequest& request) const; private: std::shared_ptr endpointProvider_; diff --git a/et-industry-openapi/include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCRequest.h b/et-industry-openapi/include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCRequest.h deleted file mode 100644 index c99b9d88c..000000000 --- a/et-industry-openapi/include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCRequest.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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_ET_INDUSTRY_OPENAPI_MODEL_UPLOADDEVICEDATADCREQUEST_H_ -#define ALIBABACLOUD_ET_INDUSTRY_OPENAPI_MODEL_UPLOADDEVICEDATADCREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Et_industry_openapi - { - namespace Model - { - class ALIBABACLOUD_ET_INDUSTRY_OPENAPI_EXPORT UploadDeviceDataDCRequest : public RoaServiceRequest - { - public: - struct data - { - struct data - { - std::string device_id; - std::string create_time; - std::string system_code; - std::string time; - std::string systime; - std::string value; - std::string key; - }; - std::vector data; - std::string pk; - }; - - public: - UploadDeviceDataDCRequest(); - ~UploadDeviceDataDCRequest(); - - std::vector getData()const; - void setData(const std::vector& data); - int getTaskId()const; - void setTaskId(int taskId); - - private: - std::vector data_; - int taskId_; - - }; - } - } -} -#endif // !ALIBABACLOUD_ET_INDUSTRY_OPENAPI_MODEL_UPLOADDEVICEDATADCREQUEST_H_ \ No newline at end of file diff --git a/et-industry-openapi/include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCResult.h b/et-industry-openapi/include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCResult.h deleted file mode 100644 index 6f3a94f54..000000000 --- a/et-industry-openapi/include/alibabacloud/et-industry-openapi/model/UploadDeviceDataDCResult.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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_ET_INDUSTRY_OPENAPI_MODEL_UPLOADDEVICEDATADCRESULT_H_ -#define ALIBABACLOUD_ET_INDUSTRY_OPENAPI_MODEL_UPLOADDEVICEDATADCRESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Et_industry_openapi - { - namespace Model - { - class ALIBABACLOUD_ET_INDUSTRY_OPENAPI_EXPORT UploadDeviceDataDCResult : public ServiceResult - { - public: - - - UploadDeviceDataDCResult(); - explicit UploadDeviceDataDCResult(const std::string &payload); - ~UploadDeviceDataDCResult(); - std::string getMessage()const; - std::string getData()const; - std::string getCode()const; - - protected: - void parse(const std::string &payload); - private: - std::string message_; - std::string data_; - std::string code_; - - }; - } - } -} -#endif // !ALIBABACLOUD_ET_INDUSTRY_OPENAPI_MODEL_UPLOADDEVICEDATADCRESULT_H_ \ No newline at end of file diff --git a/et-industry-openapi/src/Et-industry-openapiClient.cc b/et-industry-openapi/src/Et-industry-openapiClient.cc index 7f7cafe96..48d9938b3 100644 --- a/et-industry-openapi/src/Et-industry-openapiClient.cc +++ b/et-industry-openapi/src/Et-industry-openapiClient.cc @@ -86,40 +86,3 @@ Et_industry_openapiClient::UploadDeviceDataOutcomeCallable Et_industry_openapiCl asyncExecute(new Runnable([task]() { (*task)(); })); return task->get_future(); } - -Et_industry_openapiClient::UploadDeviceDataDCOutcome Et_industry_openapiClient::uploadDeviceDataDC(const UploadDeviceDataDCRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return UploadDeviceDataDCOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return UploadDeviceDataDCOutcome(UploadDeviceDataDCResult(outcome.result())); - else - return UploadDeviceDataDCOutcome(outcome.error()); -} - -void Et_industry_openapiClient::uploadDeviceDataDCAsync(const UploadDeviceDataDCRequest& request, const UploadDeviceDataDCAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, uploadDeviceDataDC(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -Et_industry_openapiClient::UploadDeviceDataDCOutcomeCallable Et_industry_openapiClient::uploadDeviceDataDCCallable(const UploadDeviceDataDCRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->uploadDeviceDataDC(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - diff --git a/et-industry-openapi/src/model/UploadDeviceDataDCRequest.cc b/et-industry-openapi/src/model/UploadDeviceDataDCRequest.cc deleted file mode 100644 index 658781a92..000000000 --- a/et-industry-openapi/src/model/UploadDeviceDataDCRequest.cc +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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::Et_industry_openapi::Model::UploadDeviceDataDCRequest; - -UploadDeviceDataDCRequest::UploadDeviceDataDCRequest() : - RoaServiceRequest("et-industry-openapi", "2019-06-10") -{ - setResourcePath("/api/report/point"); - setMethod(HttpRequest::Method::Post); -} - -UploadDeviceDataDCRequest::~UploadDeviceDataDCRequest() -{} - -std::vector UploadDeviceDataDCRequest::getData()const -{ - return data_; -} - -void UploadDeviceDataDCRequest::setData(const std::vector& data) -{ - data_ = data; - for(int dep1 = 0; dep1!= data.size(); dep1++) { - auto dataObj = data.at(dep1); - std::string dataObjStr = "data." + std::to_string(dep1 + 1); - for(int dep2 = 0; dep2!= dataObj.data.size(); dep2++) { - auto dataObj = dataObj.data.at(dep2); - std::string dataObjStr = dataObjStr + "data." + std::to_string(dep2 + 1); - setParameter(dataObjStr + ".Device_id", dataObj.device_id); - setParameter(dataObjStr + ".Create_time", dataObj.create_time); - setParameter(dataObjStr + ".System_code", dataObj.system_code); - setParameter(dataObjStr + ".Time", dataObj.time); - setParameter(dataObjStr + ".Systime", dataObj.systime); - setParameter(dataObjStr + ".Value", dataObj.value); - setParameter(dataObjStr + ".Key", dataObj.key); - } - setParameter(dataObjStr + ".Pk", dataObj.pk); - } -} - -int UploadDeviceDataDCRequest::getTaskId()const -{ - return taskId_; -} - -void UploadDeviceDataDCRequest::setTaskId(int taskId) -{ - taskId_ = taskId; - setBodyParameter("TaskId", std::to_string(taskId)); -} - diff --git a/et-industry-openapi/src/model/UploadDeviceDataDCResult.cc b/et-industry-openapi/src/model/UploadDeviceDataDCResult.cc deleted file mode 100644 index 3d4e9f6c9..000000000 --- a/et-industry-openapi/src/model/UploadDeviceDataDCResult.cc +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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::Et_industry_openapi; -using namespace AlibabaCloud::Et_industry_openapi::Model; - -UploadDeviceDataDCResult::UploadDeviceDataDCResult() : - ServiceResult() -{} - -UploadDeviceDataDCResult::UploadDeviceDataDCResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -UploadDeviceDataDCResult::~UploadDeviceDataDCResult() -{} - -void UploadDeviceDataDCResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - if(!value["Data"].isNull()) - data_ = value["Data"].asString(); - if(!value["Code"].isNull()) - code_ = value["Code"].asString(); - if(!value["Message"].isNull()) - message_ = value["Message"].asString(); - -} - -std::string UploadDeviceDataDCResult::getMessage()const -{ - return message_; -} - -std::string UploadDeviceDataDCResult::getData()const -{ - return data_; -} - -std::string UploadDeviceDataDCResult::getCode()const -{ - return code_; -} -