From 6f44f2780264b624aea24ecc61df417f980a2e24 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 21 Jul 2020 14:09:08 +0800 Subject: [PATCH] Add algorithm type for ListPerson. --- CHANGELOG | 3 ++ VERSION | 2 +- .../vcs/model/CreateCorpRequest.h | 3 ++ .../vcs/model/CreateVideoSummaryTaskRequest.h | 12 +++---- .../vcs/model/GetPersonDetailRequest.h | 3 ++ .../model/ListBodyAlgorithmResultsResult.h | 6 ++++ .../model/ListEventAlgorithmResultsResult.h | 1 + .../model/ListMotorAlgorithmResultsResult.h | 7 ++++ .../vcs/model/ListPersonsRequest.h | 9 +++++ vcs/src/VcsClient.cc | 6 ++-- vcs/src/model/CreateCorpRequest.cc | 11 +++++++ .../model/CreateVideoSummaryTaskRequest.cc | 12 +++---- vcs/src/model/GetPersonDetailRequest.cc | 11 +++++++ .../model/ListBodyAlgorithmResultsResult.cc | 12 +++++++ .../model/ListEventAlgorithmResultsResult.cc | 2 ++ .../model/ListMotorAlgorithmResultsResult.cc | 14 ++++++++ vcs/src/model/ListPersonsRequest.cc | 33 +++++++++++++++++++ 17 files changed, 131 insertions(+), 16 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 967b025e9..40a66ee35 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-07-21 Version: 1.36.523 +- Add algorithm type for ListPerson. + 2020-07-17 Version: 1.36.522 - Add DescribeRegions. - Modify DescribeFullBackupList. diff --git a/VERSION b/VERSION index efa8fcad6..3dbcd8030 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.522 \ No newline at end of file +1.36.523 \ No newline at end of file diff --git a/vcs/include/alibabacloud/vcs/model/CreateCorpRequest.h b/vcs/include/alibabacloud/vcs/model/CreateCorpRequest.h index f6725e195..5db0897b3 100644 --- a/vcs/include/alibabacloud/vcs/model/CreateCorpRequest.h +++ b/vcs/include/alibabacloud/vcs/model/CreateCorpRequest.h @@ -35,6 +35,8 @@ namespace AlibabaCloud CreateCorpRequest(); ~CreateCorpRequest(); + std::string getAlgorithmType()const; + void setAlgorithmType(const std::string& algorithmType); std::string getParentCorpId()const; void setParentCorpId(const std::string& parentCorpId); std::string getDescription()const; @@ -45,6 +47,7 @@ namespace AlibabaCloud void setCorpName(const std::string& corpName); private: + std::string algorithmType_; std::string parentCorpId_; std::string description_; std::string appName_; diff --git a/vcs/include/alibabacloud/vcs/model/CreateVideoSummaryTaskRequest.h b/vcs/include/alibabacloud/vcs/model/CreateVideoSummaryTaskRequest.h index 952eaaf27..650c2ceb4 100644 --- a/vcs/include/alibabacloud/vcs/model/CreateVideoSummaryTaskRequest.h +++ b/vcs/include/alibabacloud/vcs/model/CreateVideoSummaryTaskRequest.h @@ -39,21 +39,21 @@ namespace AlibabaCloud void setCorpId(const std::string& corpId); std::string getLiveVideoSummary()const; void setLiveVideoSummary(const std::string& liveVideoSummary); - std::string getStartTimeStamp()const; - void setStartTimeStamp(const std::string& startTimeStamp); + long getStartTimeStamp()const; + void setStartTimeStamp(long startTimeStamp); std::string getDeviceId()const; void setDeviceId(const std::string& deviceId); - std::string getEndTimeStamp()const; - void setEndTimeStamp(const std::string& endTimeStamp); + long getEndTimeStamp()const; + void setEndTimeStamp(long endTimeStamp); std::string getOptionList()const; void setOptionList(const std::string& optionList); private: std::string corpId_; std::string liveVideoSummary_; - std::string startTimeStamp_; + long startTimeStamp_; std::string deviceId_; - std::string endTimeStamp_; + long endTimeStamp_; std::string optionList_; }; diff --git a/vcs/include/alibabacloud/vcs/model/GetPersonDetailRequest.h b/vcs/include/alibabacloud/vcs/model/GetPersonDetailRequest.h index 25a3b3fc0..b9bbc08c8 100644 --- a/vcs/include/alibabacloud/vcs/model/GetPersonDetailRequest.h +++ b/vcs/include/alibabacloud/vcs/model/GetPersonDetailRequest.h @@ -35,12 +35,15 @@ namespace AlibabaCloud GetPersonDetailRequest(); ~GetPersonDetailRequest(); + std::string getAlgorithmType()const; + void setAlgorithmType(const std::string& algorithmType); std::string getCorpId()const; void setCorpId(const std::string& corpId); std::string getPersonID()const; void setPersonID(const std::string& personID); private: + std::string algorithmType_; std::string corpId_; std::string personID_; diff --git a/vcs/include/alibabacloud/vcs/model/ListBodyAlgorithmResultsResult.h b/vcs/include/alibabacloud/vcs/model/ListBodyAlgorithmResultsResult.h index a317661e5..f018b9a5d 100644 --- a/vcs/include/alibabacloud/vcs/model/ListBodyAlgorithmResultsResult.h +++ b/vcs/include/alibabacloud/vcs/model/ListBodyAlgorithmResultsResult.h @@ -46,9 +46,15 @@ namespace AlibabaCloud float leftTopY; std::string capStyle; float leftTopX; + std::string trousersStyle; + std::string coatStyle; std::string minAge; + std::string trousersLength; std::string personId; + std::string coatLength; std::string shotTime; + std::string coatColor; + std::string trousersColor; std::string dataSourceId; std::string hairStyle; }; diff --git a/vcs/include/alibabacloud/vcs/model/ListEventAlgorithmResultsResult.h b/vcs/include/alibabacloud/vcs/model/ListEventAlgorithmResultsResult.h index 2d3e08d86..46a59b1fe 100644 --- a/vcs/include/alibabacloud/vcs/model/ListEventAlgorithmResultsResult.h +++ b/vcs/include/alibabacloud/vcs/model/ListEventAlgorithmResultsResult.h @@ -41,6 +41,7 @@ namespace AlibabaCloud std::string eventType; std::string targetPicUrlPath; std::string shotTime; + std::string recordId; std::string capStyle; std::string faceCount; std::string dataSourceId; diff --git a/vcs/include/alibabacloud/vcs/model/ListMotorAlgorithmResultsResult.h b/vcs/include/alibabacloud/vcs/model/ListMotorAlgorithmResultsResult.h index 1d8053f78..8049798f1 100644 --- a/vcs/include/alibabacloud/vcs/model/ListMotorAlgorithmResultsResult.h +++ b/vcs/include/alibabacloud/vcs/model/ListMotorAlgorithmResultsResult.h @@ -40,13 +40,20 @@ namespace AlibabaCloud std::string plateNumber; std::string corpId; float rightBottomX; + std::string motorColor; float rightBottomY; std::string targetPicUrlPath; + std::string calling; + std::string motorClass; float leftTopY; std::string motorModel; float leftTopX; + std::string motorBrand; std::string motorId; + std::string plateClass; std::string motorStyle; + std::string safetyBelt; + std::string plateColor; std::string shotTime; std::string dataSourceId; }; diff --git a/vcs/include/alibabacloud/vcs/model/ListPersonsRequest.h b/vcs/include/alibabacloud/vcs/model/ListPersonsRequest.h index ba4284a8a..fc61055f6 100644 --- a/vcs/include/alibabacloud/vcs/model/ListPersonsRequest.h +++ b/vcs/include/alibabacloud/vcs/model/ListPersonsRequest.h @@ -35,15 +35,24 @@ namespace AlibabaCloud ListPersonsRequest(); ~ListPersonsRequest(); + std::string getAlgorithmType()const; + void setAlgorithmType(const std::string& algorithmType); std::string getCorpId()const; void setCorpId(const std::string& corpId); + std::string getEndTime()const; + void setEndTime(const std::string& endTime); + std::string getStartTime()const; + void setStartTime(const std::string& startTime); std::string getPageNo()const; void setPageNo(const std::string& pageNo); std::string getPageSize()const; void setPageSize(const std::string& pageSize); private: + std::string algorithmType_; std::string corpId_; + std::string endTime_; + std::string startTime_; std::string pageNo_; std::string pageSize_; diff --git a/vcs/src/VcsClient.cc b/vcs/src/VcsClient.cc index 320183297..b9635bb56 100644 --- a/vcs/src/VcsClient.cc +++ b/vcs/src/VcsClient.cc @@ -31,21 +31,21 @@ VcsClient::VcsClient(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, "vcs"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } VcsClient::VcsClient(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, "vcs"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } VcsClient::VcsClient(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, "vcs"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } VcsClient::~VcsClient() diff --git a/vcs/src/model/CreateCorpRequest.cc b/vcs/src/model/CreateCorpRequest.cc index 11094f7c5..71366da23 100644 --- a/vcs/src/model/CreateCorpRequest.cc +++ b/vcs/src/model/CreateCorpRequest.cc @@ -27,6 +27,17 @@ CreateCorpRequest::CreateCorpRequest() : CreateCorpRequest::~CreateCorpRequest() {} +std::string CreateCorpRequest::getAlgorithmType()const +{ + return algorithmType_; +} + +void CreateCorpRequest::setAlgorithmType(const std::string& algorithmType) +{ + algorithmType_ = algorithmType; + setBodyParameter("AlgorithmType", algorithmType); +} + std::string CreateCorpRequest::getParentCorpId()const { return parentCorpId_; diff --git a/vcs/src/model/CreateVideoSummaryTaskRequest.cc b/vcs/src/model/CreateVideoSummaryTaskRequest.cc index 40748a0f7..8486432ba 100644 --- a/vcs/src/model/CreateVideoSummaryTaskRequest.cc +++ b/vcs/src/model/CreateVideoSummaryTaskRequest.cc @@ -49,15 +49,15 @@ void CreateVideoSummaryTaskRequest::setLiveVideoSummary(const std::string& liveV setBodyParameter("LiveVideoSummary", liveVideoSummary); } -std::string CreateVideoSummaryTaskRequest::getStartTimeStamp()const +long CreateVideoSummaryTaskRequest::getStartTimeStamp()const { return startTimeStamp_; } -void CreateVideoSummaryTaskRequest::setStartTimeStamp(const std::string& startTimeStamp) +void CreateVideoSummaryTaskRequest::setStartTimeStamp(long startTimeStamp) { startTimeStamp_ = startTimeStamp; - setBodyParameter("StartTimeStamp", startTimeStamp); + setBodyParameter("StartTimeStamp", std::to_string(startTimeStamp)); } std::string CreateVideoSummaryTaskRequest::getDeviceId()const @@ -71,15 +71,15 @@ void CreateVideoSummaryTaskRequest::setDeviceId(const std::string& deviceId) setBodyParameter("DeviceId", deviceId); } -std::string CreateVideoSummaryTaskRequest::getEndTimeStamp()const +long CreateVideoSummaryTaskRequest::getEndTimeStamp()const { return endTimeStamp_; } -void CreateVideoSummaryTaskRequest::setEndTimeStamp(const std::string& endTimeStamp) +void CreateVideoSummaryTaskRequest::setEndTimeStamp(long endTimeStamp) { endTimeStamp_ = endTimeStamp; - setBodyParameter("EndTimeStamp", endTimeStamp); + setBodyParameter("EndTimeStamp", std::to_string(endTimeStamp)); } std::string CreateVideoSummaryTaskRequest::getOptionList()const diff --git a/vcs/src/model/GetPersonDetailRequest.cc b/vcs/src/model/GetPersonDetailRequest.cc index 65e73753d..3c044a6e5 100644 --- a/vcs/src/model/GetPersonDetailRequest.cc +++ b/vcs/src/model/GetPersonDetailRequest.cc @@ -27,6 +27,17 @@ GetPersonDetailRequest::GetPersonDetailRequest() : GetPersonDetailRequest::~GetPersonDetailRequest() {} +std::string GetPersonDetailRequest::getAlgorithmType()const +{ + return algorithmType_; +} + +void GetPersonDetailRequest::setAlgorithmType(const std::string& algorithmType) +{ + algorithmType_ = algorithmType; + setBodyParameter("AlgorithmType", algorithmType); +} + std::string GetPersonDetailRequest::getCorpId()const { return corpId_; diff --git a/vcs/src/model/ListBodyAlgorithmResultsResult.cc b/vcs/src/model/ListBodyAlgorithmResultsResult.cc index 43bd7ed7f..ae924456b 100644 --- a/vcs/src/model/ListBodyAlgorithmResultsResult.cc +++ b/vcs/src/model/ListBodyAlgorithmResultsResult.cc @@ -82,6 +82,18 @@ void ListBodyAlgorithmResultsResult::parse(const std::string &payload) recordsItemObject.shotTime = dataNodeRecordsRecordsItem["ShotTime"].asString(); if(!dataNodeRecordsRecordsItem["TargetPicUrlPath"].isNull()) recordsItemObject.targetPicUrlPath = dataNodeRecordsRecordsItem["TargetPicUrlPath"].asString(); + if(!dataNodeRecordsRecordsItem["CoatLength"].isNull()) + recordsItemObject.coatLength = dataNodeRecordsRecordsItem["CoatLength"].asString(); + if(!dataNodeRecordsRecordsItem["CoatStyle"].isNull()) + recordsItemObject.coatStyle = dataNodeRecordsRecordsItem["CoatStyle"].asString(); + if(!dataNodeRecordsRecordsItem["TrousersLength"].isNull()) + recordsItemObject.trousersLength = dataNodeRecordsRecordsItem["TrousersLength"].asString(); + if(!dataNodeRecordsRecordsItem["TrousersStyle"].isNull()) + recordsItemObject.trousersStyle = dataNodeRecordsRecordsItem["TrousersStyle"].asString(); + if(!dataNodeRecordsRecordsItem["CoatColor"].isNull()) + recordsItemObject.coatColor = dataNodeRecordsRecordsItem["CoatColor"].asString(); + if(!dataNodeRecordsRecordsItem["TrousersColor"].isNull()) + recordsItemObject.trousersColor = dataNodeRecordsRecordsItem["TrousersColor"].asString(); data_.records.push_back(recordsItemObject); } if(!value["Code"].isNull()) diff --git a/vcs/src/model/ListEventAlgorithmResultsResult.cc b/vcs/src/model/ListEventAlgorithmResultsResult.cc index a71fc0f47..272009df0 100644 --- a/vcs/src/model/ListEventAlgorithmResultsResult.cc +++ b/vcs/src/model/ListEventAlgorithmResultsResult.cc @@ -68,6 +68,8 @@ void ListEventAlgorithmResultsResult::parse(const std::string &payload) recordsItemObject.shotTime = dataNodeRecordsRecordsItem["ShotTime"].asString(); if(!dataNodeRecordsRecordsItem["TargetPicUrlPath"].isNull()) recordsItemObject.targetPicUrlPath = dataNodeRecordsRecordsItem["TargetPicUrlPath"].asString(); + if(!dataNodeRecordsRecordsItem["RecordId"].isNull()) + recordsItemObject.recordId = dataNodeRecordsRecordsItem["RecordId"].asString(); data_.records.push_back(recordsItemObject); } if(!value["Code"].isNull()) diff --git a/vcs/src/model/ListMotorAlgorithmResultsResult.cc b/vcs/src/model/ListMotorAlgorithmResultsResult.cc index 6f47f5ef9..c1e86f430 100644 --- a/vcs/src/model/ListMotorAlgorithmResultsResult.cc +++ b/vcs/src/model/ListMotorAlgorithmResultsResult.cc @@ -78,6 +78,20 @@ void ListMotorAlgorithmResultsResult::parse(const std::string &payload) recordsItemObject.motorStyle = dataNodeRecordsRecordsItem["MotorStyle"].asString(); if(!dataNodeRecordsRecordsItem["MotorModel"].isNull()) recordsItemObject.motorModel = dataNodeRecordsRecordsItem["MotorModel"].asString(); + if(!dataNodeRecordsRecordsItem["MotorColor"].isNull()) + recordsItemObject.motorColor = dataNodeRecordsRecordsItem["MotorColor"].asString(); + if(!dataNodeRecordsRecordsItem["MotorClass"].isNull()) + recordsItemObject.motorClass = dataNodeRecordsRecordsItem["MotorClass"].asString(); + if(!dataNodeRecordsRecordsItem["MotorBrand"].isNull()) + recordsItemObject.motorBrand = dataNodeRecordsRecordsItem["MotorBrand"].asString(); + if(!dataNodeRecordsRecordsItem["PlateColor"].isNull()) + recordsItemObject.plateColor = dataNodeRecordsRecordsItem["PlateColor"].asString(); + if(!dataNodeRecordsRecordsItem["PlateClass"].isNull()) + recordsItemObject.plateClass = dataNodeRecordsRecordsItem["PlateClass"].asString(); + if(!dataNodeRecordsRecordsItem["SafetyBelt"].isNull()) + recordsItemObject.safetyBelt = dataNodeRecordsRecordsItem["SafetyBelt"].asString(); + if(!dataNodeRecordsRecordsItem["Calling"].isNull()) + recordsItemObject.calling = dataNodeRecordsRecordsItem["Calling"].asString(); data_.records.push_back(recordsItemObject); } if(!value["Code"].isNull()) diff --git a/vcs/src/model/ListPersonsRequest.cc b/vcs/src/model/ListPersonsRequest.cc index d2ea35f97..6a27bf495 100644 --- a/vcs/src/model/ListPersonsRequest.cc +++ b/vcs/src/model/ListPersonsRequest.cc @@ -27,6 +27,17 @@ ListPersonsRequest::ListPersonsRequest() : ListPersonsRequest::~ListPersonsRequest() {} +std::string ListPersonsRequest::getAlgorithmType()const +{ + return algorithmType_; +} + +void ListPersonsRequest::setAlgorithmType(const std::string& algorithmType) +{ + algorithmType_ = algorithmType; + setBodyParameter("AlgorithmType", algorithmType); +} + std::string ListPersonsRequest::getCorpId()const { return corpId_; @@ -38,6 +49,28 @@ void ListPersonsRequest::setCorpId(const std::string& corpId) setBodyParameter("CorpId", corpId); } +std::string ListPersonsRequest::getEndTime()const +{ + return endTime_; +} + +void ListPersonsRequest::setEndTime(const std::string& endTime) +{ + endTime_ = endTime; + setBodyParameter("EndTime", endTime); +} + +std::string ListPersonsRequest::getStartTime()const +{ + return startTime_; +} + +void ListPersonsRequest::setStartTime(const std::string& startTime) +{ + startTime_ = startTime; + setBodyParameter("StartTime", startTime); +} + std::string ListPersonsRequest::getPageNo()const { return pageNo_;