diff --git a/VERSION b/VERSION index 3f91327c7..32b0e7de1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1660 \ No newline at end of file +1.36.1661 \ No newline at end of file diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInstanceResult.h b/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInstanceResult.h index c05c3ec26..519cf4fd1 100644 --- a/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInstanceResult.h +++ b/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInstanceResult.h @@ -39,15 +39,18 @@ namespace AlibabaCloud int status; int triggerType; std::string progress; + std::string parameters; std::string endTime; long instanceId; std::string workAddr; std::string startTime; + std::string jobName; std::string dataTime; std::string result; int timeType; std::string executor; std::string scheduleTime; + std::string traceId; long jobId; }; JobInstanceDetail jobInstanceDetail; diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/GetWorkflowInstanceResult.h b/schedulerx2/include/alibabacloud/schedulerx2/model/GetWorkflowInstanceResult.h index 8a3f369be..c36f8b711 100644 --- a/schedulerx2/include/alibabacloud/schedulerx2/model/GetWorkflowInstanceResult.h +++ b/schedulerx2/include/alibabacloud/schedulerx2/model/GetWorkflowInstanceResult.h @@ -46,6 +46,7 @@ namespace AlibabaCloud { struct Node { + int status; std::string endTime; std::string scheduleTime; int attempt; diff --git a/schedulerx2/src/model/GetJobInstanceResult.cc b/schedulerx2/src/model/GetJobInstanceResult.cc index 8f7ca5a93..d01de0880 100644 --- a/schedulerx2/src/model/GetJobInstanceResult.cc +++ b/schedulerx2/src/model/GetJobInstanceResult.cc @@ -67,6 +67,12 @@ void GetJobInstanceResult::parse(const std::string &payload) data_.jobInstanceDetail.dataTime = jobInstanceDetailNode["DataTime"].asString(); if(!jobInstanceDetailNode["WorkAddr"].isNull()) data_.jobInstanceDetail.workAddr = jobInstanceDetailNode["WorkAddr"].asString(); + if(!jobInstanceDetailNode["Parameters"].isNull()) + data_.jobInstanceDetail.parameters = jobInstanceDetailNode["Parameters"].asString(); + if(!jobInstanceDetailNode["JobName"].isNull()) + data_.jobInstanceDetail.jobName = jobInstanceDetailNode["JobName"].asString(); + if(!jobInstanceDetailNode["TraceId"].isNull()) + data_.jobInstanceDetail.traceId = jobInstanceDetailNode["TraceId"].asString(); if(!value["Code"].isNull()) code_ = std::stoi(value["Code"].asString()); if(!value["Message"].isNull()) diff --git a/schedulerx2/src/model/GetWorkflowInstanceResult.cc b/schedulerx2/src/model/GetWorkflowInstanceResult.cc index a562e7e94..11e4d0871 100644 --- a/schedulerx2/src/model/GetWorkflowInstanceResult.cc +++ b/schedulerx2/src/model/GetWorkflowInstanceResult.cc @@ -74,6 +74,8 @@ void GetWorkflowInstanceResult::parse(const std::string &payload) nodeObject.result = wfInstanceDagNodeNodesNode["Result"].asString(); if(!wfInstanceDagNodeNodesNode["Attempt"].isNull()) nodeObject.attempt = std::stoi(wfInstanceDagNodeNodesNode["Attempt"].asString()); + if(!wfInstanceDagNodeNodesNode["Status"].isNull()) + nodeObject.status = std::stoi(wfInstanceDagNodeNodesNode["Status"].asString()); data_.wfInstanceDag.nodes.push_back(nodeObject); } auto allEdgesNode = wfInstanceDagNode["Edges"]["Edge"];