|
@@ -488,6 +488,9 @@ SATHTTP_API int Heartbeat(std::string url, const SATHTTP::STHeartbeatReq &stHear
|
|
|
stTask.Job.strDiffTaskInstanceFlag = cJSON_GetObjectItem(pJob, "diffTaskInstanceFlag") ? cJSON_GetObjectItem(pJob, "diffTaskInstanceFlag")->valuestring : "";
|
|
|
stTask.Job.strBusCode = cJSON_GetObjectItem(pJob, "busCode") ? cJSON_GetObjectItem(pJob, "busCode")->valuestring : "";
|
|
|
stTask.Job.strRound = cJSON_GetObjectItem(pJob, "round") ? cJSON_GetObjectItem(pJob, "round")->valuestring : "";
|
|
|
+#ifdef _DEBUG
|
|
|
+ stTask.Job.strRound = "3";
|
|
|
+#endif
|
|
|
stTask.Job.strControlType = cJSON_GetObjectItem(pJob, "controlType") ? cJSON_GetObjectItem(pJob, "controlType")->valuestring : "";
|
|
|
stTask.Job.strMonkeyPctMajornav = cJSON_GetObjectItem(pJob, "monkeyPctMajornav") ? cJSON_GetObjectItem(pJob, "monkeyPctMajornav")->valuestring : "";
|
|
|
stTask.Job.strTaskName = cJSON_GetObjectItem(pJob, "taskName") ? cJSON_GetObjectItem(pJob, "taskName")->valuestring : "";
|
|
@@ -520,7 +523,7 @@ SATHTTP_API int Heartbeat(std::string url, const SATHTTP::STHeartbeatReq &stHear
|
|
|
stCase.strId = cJSON_GetObjectItem(pCase, "id") ? cJSON_GetObjectItem(pCase, "id")->valuestring : "";
|
|
|
stCase.strCaseType = cJSON_GetObjectItem(pCase, "caseType") ? cJSON_GetObjectItem(pCase, "caseType")->valuestring : "";
|
|
|
// ѹÈëJob;
|
|
|
- stTask.Job.vtCases.push_back(stCase);
|
|
|
+ stTask.vtCases.push_back(stCase);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1052,6 +1055,7 @@ SATHTTP_API int SaveCaseOrTaskLog(std::string url, const SATHTTP::STSaveLogReq &
|
|
|
cJSON_AddStringToObject(pData, "caseId", stSaveLogReq.strCaseId.c_str());
|
|
|
cJSON_AddStringToObject(pData, "taskId", stSaveLogReq.strTaskId.c_str());
|
|
|
cJSON_AddStringToObject(pData, "executeId", stSaveLogReq.strExecuteId.c_str());
|
|
|
+ cJSON_AddStringToObject(pData, "roundNum", stSaveLogReq.strRoundNum.c_str());
|
|
|
|
|
|
// Ìí¼Óµ½¸ù½áµãÖÐ;
|
|
|
cJSON_AddItemToObject(pRoot, "data", pData);
|