From 6007aa1ea1d691ffb80c8da77900a5d40be76e3d Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 25 Jan 2022 12:53:30 +0000 Subject: [PATCH] Supported new features for outbound. --- CHANGELOG | 3 + VERSION | 2 +- .../model/CreateBatchRepeatJobRequest.h | 24 +++-- .../model/CreateBatchRepeatJobResult.h | 2 + .../outboundbot/model/CreateJobGroupRequest.h | 24 +++-- .../outboundbot/model/CreateJobGroupResult.h | 2 + .../model/DescribeJobGroupResult.h | 2 + .../outboundbot/model/DescribeJobResult.h | 1 + .../outboundbot/model/ModifyJobGroupRequest.h | 6 ++ .../outboundbot/model/ModifyJobGroupResult.h | 2 + .../src/model/CreateBatchRepeatJobRequest.cc | 76 +++++++++------ .../src/model/CreateBatchRepeatJobResult.cc | 4 + .../src/model/CreateJobGroupRequest.cc | 92 ++++++++++++------- outboundbot/src/model/CreateJobGroupResult.cc | 4 + .../src/model/DescribeJobGroupResult.cc | 4 + outboundbot/src/model/DescribeJobResult.cc | 2 + .../src/model/ModifyJobGroupRequest.cc | 22 +++++ outboundbot/src/model/ModifyJobGroupResult.cc | 4 + 18 files changed, 195 insertions(+), 81 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 817813123..945cd44f5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2022-01-25 Version: 1.36.1042 +- Supported new features for outbound. + 2022-01-25 Version: 1.36.1041 - Support Latest APIs. diff --git a/VERSION b/VERSION index fdf0fbb87..c70fae864 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1041 \ No newline at end of file +1.36.1042 \ No newline at end of file diff --git a/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobRequest.h b/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobRequest.h index b940c861f..a1866db07 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobRequest.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobRequest.h @@ -41,32 +41,38 @@ namespace AlibabaCloud void setDescription(const std::string& description); std::string getScriptId()const; void setScriptId(const std::string& scriptId); - std::vector getCallingNumber()const; - void setCallingNumber(const std::vector& callingNumber); - std::string getInstanceId()const; - void setInstanceId(const std::string& instanceId); std::string getFilterStatus()const; void setFilterStatus(const std::string& filterStatus); std::string getStrategyJson()const; void setStrategyJson(const std::string& strategyJson); + long getRingingDuration()const; + void setRingingDuration(long ringingDuration); + std::string getPriority()const; + void setPriority(const std::string& priority); + std::vector getCallingNumber()const; + void setCallingNumber(const std::vector& callingNumber); + std::string getInstanceId()const; + void setInstanceId(const std::string& instanceId); std::string getName()const; void setName(const std::string& name); std::string getSourceGroupId()const; void setSourceGroupId(const std::string& sourceGroupId); - long getRingingDuration()const; - void setRingingDuration(long ringingDuration); + long getMinConcurrency()const; + void setMinConcurrency(long minConcurrency); private: std::string recallStrategyJson_; std::string description_; std::string scriptId_; - std::vector callingNumber_; - std::string instanceId_; std::string filterStatus_; std::string strategyJson_; + long ringingDuration_; + std::string priority_; + std::vector callingNumber_; + std::string instanceId_; std::string name_; std::string sourceGroupId_; - long ringingDuration_; + long minConcurrency_; }; } diff --git a/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobResult.h b/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobResult.h index c5ad91d3b..215ec72df 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobResult.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/CreateBatchRepeatJobResult.h @@ -34,8 +34,10 @@ namespace AlibabaCloud public: struct JobGroup { + std::string priority; std::string id; long ringingDuration; + long minConcurrency; }; diff --git a/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupRequest.h b/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupRequest.h index dbeae564b..246426916 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupRequest.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupRequest.h @@ -37,33 +37,39 @@ namespace AlibabaCloud std::string getRecallStrategyJson()const; void setRecallStrategyJson(const std::string& recallStrategyJson); - std::string getJobGroupDescription()const; - void setJobGroupDescription(const std::string& jobGroupDescription); std::string getJobGroupName()const; void setJobGroupName(const std::string& jobGroupName); std::string getScriptId()const; void setScriptId(const std::string& scriptId); - std::vector getCallingNumber()const; - void setCallingNumber(const std::vector& callingNumber); - std::string getInstanceId()const; - void setInstanceId(const std::string& instanceId); std::string getStrategyJson()const; void setStrategyJson(const std::string& strategyJson); long getRingingDuration()const; void setRingingDuration(long ringingDuration); std::string getScenarioId()const; void setScenarioId(const std::string& scenarioId); + std::string getPriority()const; + void setPriority(const std::string& priority); + std::string getJobGroupDescription()const; + void setJobGroupDescription(const std::string& jobGroupDescription); + std::vector getCallingNumber()const; + void setCallingNumber(const std::vector& callingNumber); + std::string getInstanceId()const; + void setInstanceId(const std::string& instanceId); + long getMinConcurrency()const; + void setMinConcurrency(long minConcurrency); private: std::string recallStrategyJson_; - std::string jobGroupDescription_; std::string jobGroupName_; std::string scriptId_; - std::vector callingNumber_; - std::string instanceId_; std::string strategyJson_; long ringingDuration_; std::string scenarioId_; + std::string priority_; + std::string jobGroupDescription_; + std::vector callingNumber_; + std::string instanceId_; + long minConcurrency_; }; } diff --git a/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupResult.h b/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupResult.h index 81dbdd5c2..b045e0c25 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupResult.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/CreateJobGroupResult.h @@ -75,8 +75,10 @@ namespace AlibabaCloud std::string jobDataParsingTaskId; std::string jobGroupName; std::string scriptVersion; + std::string priority; std::string jobGroupDescription; long ringingDuration; + long minConcurrency; std::string jobGroupId; std::string scriptName; long creationTime; diff --git a/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobGroupResult.h b/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobGroupResult.h index 69de2c127..4b5283a23 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobGroupResult.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobGroupResult.h @@ -105,10 +105,12 @@ namespace AlibabaCloud std::string jobDataParsingTaskId; std::string jobGroupName; std::string scriptVersion; + std::string priority; std::string scriptId; std::string jobGroupDescription; Result result; long ringingDuration; + long minConcurrency; std::string jobGroupId; std::string scriptName; long creationTime; diff --git a/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobResult.h b/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobResult.h index 88a271627..01311aa91 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobResult.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/DescribeJobResult.h @@ -97,6 +97,7 @@ namespace AlibabaCloud int duration; std::string brief; std::string callingNumber; + long ringingDuration; std::string endReason; Contact3 contact3; std::string hangUpDirection; diff --git a/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupRequest.h b/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupRequest.h index 8413da17a..e38213981 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupRequest.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupRequest.h @@ -49,6 +49,8 @@ namespace AlibabaCloud void setScenarioId(const std::string& scenarioId); std::string getJobGroupStatus()const; void setJobGroupStatus(const std::string& jobGroupStatus); + std::string getPriority()const; + void setPriority(const std::string& priority); std::vector getCallingNumber()const; void setCallingNumber(const std::vector& callingNumber); std::string getInstanceId()const; @@ -57,6 +59,8 @@ namespace AlibabaCloud void setJobGroupId(const std::string& jobGroupId); std::string getName()const; void setName(const std::string& name); + long getMinConcurrency()const; + void setMinConcurrency(long minConcurrency); private: std::string recallStrategyJson_; @@ -66,10 +70,12 @@ namespace AlibabaCloud long ringingDuration_; std::string scenarioId_; std::string jobGroupStatus_; + std::string priority_; std::vector callingNumber_; std::string instanceId_; std::string jobGroupId_; std::string name_; + long minConcurrency_; }; } diff --git a/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupResult.h b/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupResult.h index 0c33fc16d..77c7eadf5 100644 --- a/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupResult.h +++ b/outboundbot/include/alibabacloud/outboundbot/model/ModifyJobGroupResult.h @@ -75,8 +75,10 @@ namespace AlibabaCloud std::string jobDataParsingTaskId; std::string jobGroupName; std::string scriptVersion; + std::string priority; std::string jobGroupDescription; long ringingDuration; + long minConcurrency; std::string jobGroupId; std::string scriptName; long creationTime; diff --git a/outboundbot/src/model/CreateBatchRepeatJobRequest.cc b/outboundbot/src/model/CreateBatchRepeatJobRequest.cc index 9fb770b1a..203ed5753 100644 --- a/outboundbot/src/model/CreateBatchRepeatJobRequest.cc +++ b/outboundbot/src/model/CreateBatchRepeatJobRequest.cc @@ -60,6 +60,50 @@ void CreateBatchRepeatJobRequest::setScriptId(const std::string& scriptId) setParameter("ScriptId", scriptId); } +std::string CreateBatchRepeatJobRequest::getFilterStatus()const +{ + return filterStatus_; +} + +void CreateBatchRepeatJobRequest::setFilterStatus(const std::string& filterStatus) +{ + filterStatus_ = filterStatus; + setParameter("FilterStatus", filterStatus); +} + +std::string CreateBatchRepeatJobRequest::getStrategyJson()const +{ + return strategyJson_; +} + +void CreateBatchRepeatJobRequest::setStrategyJson(const std::string& strategyJson) +{ + strategyJson_ = strategyJson; + setParameter("StrategyJson", strategyJson); +} + +long CreateBatchRepeatJobRequest::getRingingDuration()const +{ + return ringingDuration_; +} + +void CreateBatchRepeatJobRequest::setRingingDuration(long ringingDuration) +{ + ringingDuration_ = ringingDuration; + setParameter("RingingDuration", std::to_string(ringingDuration)); +} + +std::string CreateBatchRepeatJobRequest::getPriority()const +{ + return priority_; +} + +void CreateBatchRepeatJobRequest::setPriority(const std::string& priority) +{ + priority_ = priority; + setParameter("Priority", priority); +} + std::vector CreateBatchRepeatJobRequest::getCallingNumber()const { return callingNumber_; @@ -84,28 +128,6 @@ void CreateBatchRepeatJobRequest::setInstanceId(const std::string& instanceId) setParameter("InstanceId", instanceId); } -std::string CreateBatchRepeatJobRequest::getFilterStatus()const -{ - return filterStatus_; -} - -void CreateBatchRepeatJobRequest::setFilterStatus(const std::string& filterStatus) -{ - filterStatus_ = filterStatus; - setParameter("FilterStatus", filterStatus); -} - -std::string CreateBatchRepeatJobRequest::getStrategyJson()const -{ - return strategyJson_; -} - -void CreateBatchRepeatJobRequest::setStrategyJson(const std::string& strategyJson) -{ - strategyJson_ = strategyJson; - setParameter("StrategyJson", strategyJson); -} - std::string CreateBatchRepeatJobRequest::getName()const { return name_; @@ -128,14 +150,14 @@ void CreateBatchRepeatJobRequest::setSourceGroupId(const std::string& sourceGrou setParameter("SourceGroupId", sourceGroupId); } -long CreateBatchRepeatJobRequest::getRingingDuration()const +long CreateBatchRepeatJobRequest::getMinConcurrency()const { - return ringingDuration_; + return minConcurrency_; } -void CreateBatchRepeatJobRequest::setRingingDuration(long ringingDuration) +void CreateBatchRepeatJobRequest::setMinConcurrency(long minConcurrency) { - ringingDuration_ = ringingDuration; - setParameter("RingingDuration", std::to_string(ringingDuration)); + minConcurrency_ = minConcurrency; + setParameter("MinConcurrency", std::to_string(minConcurrency)); } diff --git a/outboundbot/src/model/CreateBatchRepeatJobResult.cc b/outboundbot/src/model/CreateBatchRepeatJobResult.cc index deb7b1120..ebab7554b 100644 --- a/outboundbot/src/model/CreateBatchRepeatJobResult.cc +++ b/outboundbot/src/model/CreateBatchRepeatJobResult.cc @@ -44,6 +44,10 @@ void CreateBatchRepeatJobResult::parse(const std::string &payload) jobGroup_.id = jobGroupNode["Id"].asString(); if(!jobGroupNode["RingingDuration"].isNull()) jobGroup_.ringingDuration = std::stol(jobGroupNode["RingingDuration"].asString()); + if(!jobGroupNode["Priority"].isNull()) + jobGroup_.priority = jobGroupNode["Priority"].asString(); + if(!jobGroupNode["MinConcurrency"].isNull()) + jobGroup_.minConcurrency = std::stol(jobGroupNode["MinConcurrency"].asString()); if(!value["HttpStatusCode"].isNull()) httpStatusCode_ = std::stoi(value["HttpStatusCode"].asString()); if(!value["Code"].isNull()) diff --git a/outboundbot/src/model/CreateJobGroupRequest.cc b/outboundbot/src/model/CreateJobGroupRequest.cc index 293ad4d96..b7f6e6f6e 100644 --- a/outboundbot/src/model/CreateJobGroupRequest.cc +++ b/outboundbot/src/model/CreateJobGroupRequest.cc @@ -38,17 +38,6 @@ void CreateJobGroupRequest::setRecallStrategyJson(const std::string& recallStrat setParameter("RecallStrategyJson", recallStrategyJson); } -std::string CreateJobGroupRequest::getJobGroupDescription()const -{ - return jobGroupDescription_; -} - -void CreateJobGroupRequest::setJobGroupDescription(const std::string& jobGroupDescription) -{ - jobGroupDescription_ = jobGroupDescription; - setParameter("JobGroupDescription", jobGroupDescription); -} - std::string CreateJobGroupRequest::getJobGroupName()const { return jobGroupName_; @@ -71,30 +60,6 @@ void CreateJobGroupRequest::setScriptId(const std::string& scriptId) setParameter("ScriptId", scriptId); } -std::vector CreateJobGroupRequest::getCallingNumber()const -{ - return callingNumber_; -} - -void CreateJobGroupRequest::setCallingNumber(const std::vector& callingNumber) -{ - callingNumber_ = callingNumber; - for(int dep1 = 0; dep1!= callingNumber.size(); dep1++) { - setParameter("CallingNumber."+ std::to_string(dep1), callingNumber.at(dep1)); - } -} - -std::string CreateJobGroupRequest::getInstanceId()const -{ - return instanceId_; -} - -void CreateJobGroupRequest::setInstanceId(const std::string& instanceId) -{ - instanceId_ = instanceId; - setParameter("InstanceId", instanceId); -} - std::string CreateJobGroupRequest::getStrategyJson()const { return strategyJson_; @@ -128,3 +93,60 @@ void CreateJobGroupRequest::setScenarioId(const std::string& scenarioId) setParameter("ScenarioId", scenarioId); } +std::string CreateJobGroupRequest::getPriority()const +{ + return priority_; +} + +void CreateJobGroupRequest::setPriority(const std::string& priority) +{ + priority_ = priority; + setParameter("Priority", priority); +} + +std::string CreateJobGroupRequest::getJobGroupDescription()const +{ + return jobGroupDescription_; +} + +void CreateJobGroupRequest::setJobGroupDescription(const std::string& jobGroupDescription) +{ + jobGroupDescription_ = jobGroupDescription; + setParameter("JobGroupDescription", jobGroupDescription); +} + +std::vector CreateJobGroupRequest::getCallingNumber()const +{ + return callingNumber_; +} + +void CreateJobGroupRequest::setCallingNumber(const std::vector& callingNumber) +{ + callingNumber_ = callingNumber; + for(int dep1 = 0; dep1!= callingNumber.size(); dep1++) { + setParameter("CallingNumber."+ std::to_string(dep1), callingNumber.at(dep1)); + } +} + +std::string CreateJobGroupRequest::getInstanceId()const +{ + return instanceId_; +} + +void CreateJobGroupRequest::setInstanceId(const std::string& instanceId) +{ + instanceId_ = instanceId; + setParameter("InstanceId", instanceId); +} + +long CreateJobGroupRequest::getMinConcurrency()const +{ + return minConcurrency_; +} + +void CreateJobGroupRequest::setMinConcurrency(long minConcurrency) +{ + minConcurrency_ = minConcurrency; + setParameter("MinConcurrency", std::to_string(minConcurrency)); +} + diff --git a/outboundbot/src/model/CreateJobGroupResult.cc b/outboundbot/src/model/CreateJobGroupResult.cc index e242d6e35..ba7ebf0d0 100644 --- a/outboundbot/src/model/CreateJobGroupResult.cc +++ b/outboundbot/src/model/CreateJobGroupResult.cc @@ -64,6 +64,10 @@ void CreateJobGroupResult::parse(const std::string &payload) jobGroup_.modifyTime = jobGroupNode["ModifyTime"].asString(); if(!jobGroupNode["RingingDuration"].isNull()) jobGroup_.ringingDuration = std::stol(jobGroupNode["RingingDuration"].asString()); + if(!jobGroupNode["Priority"].isNull()) + jobGroup_.priority = jobGroupNode["Priority"].asString(); + if(!jobGroupNode["MinConcurrency"].isNull()) + jobGroup_.minConcurrency = std::stol(jobGroupNode["MinConcurrency"].asString()); auto exportProgressNode = jobGroupNode["ExportProgress"]; if(!exportProgressNode["Status"].isNull()) jobGroup_.exportProgress.status = exportProgressNode["Status"].asString(); diff --git a/outboundbot/src/model/DescribeJobGroupResult.cc b/outboundbot/src/model/DescribeJobGroupResult.cc index 00554de86..bba11d2bd 100644 --- a/outboundbot/src/model/DescribeJobGroupResult.cc +++ b/outboundbot/src/model/DescribeJobGroupResult.cc @@ -66,6 +66,10 @@ void DescribeJobGroupResult::parse(const std::string &payload) jobGroup_.scriptVersion = jobGroupNode["ScriptVersion"].asString(); if(!jobGroupNode["RingingDuration"].isNull()) jobGroup_.ringingDuration = std::stol(jobGroupNode["RingingDuration"].asString()); + if(!jobGroupNode["Priority"].isNull()) + jobGroup_.priority = jobGroupNode["Priority"].asString(); + if(!jobGroupNode["MinConcurrency"].isNull()) + jobGroup_.minConcurrency = std::stol(jobGroupNode["MinConcurrency"].asString()); auto exportProgressNode = jobGroupNode["ExportProgress"]; if(!exportProgressNode["Status"].isNull()) jobGroup_.exportProgress.status = exportProgressNode["Status"].asString(); diff --git a/outboundbot/src/model/DescribeJobResult.cc b/outboundbot/src/model/DescribeJobResult.cc index dd4ba4b47..ec81c025d 100644 --- a/outboundbot/src/model/DescribeJobResult.cc +++ b/outboundbot/src/model/DescribeJobResult.cc @@ -148,6 +148,8 @@ void DescribeJobResult::parse(const std::string &payload) taskObject.taskId = jobNodeTasksTask["TaskId"].asString(); if(!jobNodeTasksTask["HangUpDirection"].isNull()) taskObject.hangUpDirection = jobNodeTasksTask["HangUpDirection"].asString(); + if(!jobNodeTasksTask["RingingDuration"].isNull()) + taskObject.ringingDuration = std::stol(jobNodeTasksTask["RingingDuration"].asString()); auto allConversationNode = jobNodeTasksTask["Conversation"]["ConversationDetail"]; for (auto jobNodeTasksTaskConversationConversationDetail : allConversationNode) { diff --git a/outboundbot/src/model/ModifyJobGroupRequest.cc b/outboundbot/src/model/ModifyJobGroupRequest.cc index b305ffcd3..20c636259 100644 --- a/outboundbot/src/model/ModifyJobGroupRequest.cc +++ b/outboundbot/src/model/ModifyJobGroupRequest.cc @@ -104,6 +104,17 @@ void ModifyJobGroupRequest::setJobGroupStatus(const std::string& jobGroupStatus) setParameter("JobGroupStatus", jobGroupStatus); } +std::string ModifyJobGroupRequest::getPriority()const +{ + return priority_; +} + +void ModifyJobGroupRequest::setPriority(const std::string& priority) +{ + priority_ = priority; + setParameter("Priority", priority); +} + std::vector ModifyJobGroupRequest::getCallingNumber()const { return callingNumber_; @@ -150,3 +161,14 @@ void ModifyJobGroupRequest::setName(const std::string& name) setParameter("Name", name); } +long ModifyJobGroupRequest::getMinConcurrency()const +{ + return minConcurrency_; +} + +void ModifyJobGroupRequest::setMinConcurrency(long minConcurrency) +{ + minConcurrency_ = minConcurrency; + setParameter("MinConcurrency", std::to_string(minConcurrency)); +} + diff --git a/outboundbot/src/model/ModifyJobGroupResult.cc b/outboundbot/src/model/ModifyJobGroupResult.cc index 0c321ef39..e7a045cf8 100644 --- a/outboundbot/src/model/ModifyJobGroupResult.cc +++ b/outboundbot/src/model/ModifyJobGroupResult.cc @@ -64,6 +64,10 @@ void ModifyJobGroupResult::parse(const std::string &payload) jobGroup_.modifyTime = jobGroupNode["ModifyTime"].asString(); if(!jobGroupNode["RingingDuration"].isNull()) jobGroup_.ringingDuration = std::stol(jobGroupNode["RingingDuration"].asString()); + if(!jobGroupNode["Priority"].isNull()) + jobGroup_.priority = jobGroupNode["Priority"].asString(); + if(!jobGroupNode["MinConcurrency"].isNull()) + jobGroup_.minConcurrency = std::stol(jobGroupNode["MinConcurrency"].asString()); auto exportProgressNode = jobGroupNode["ExportProgress"]; if(!exportProgressNode["Status"].isNull()) jobGroup_.exportProgress.status = exportProgressNode["Status"].asString();