瀏覽代碼

多轮任务:
1、修改部分结构体,以便减少代码维护量;

Jeff 5 年之前
父節點
當前提交
33aef512ea
共有 2 個文件被更改,包括 21 次插入4 次删除
  1. 5 1
      SATHTTP/SATHTTP/SATHTTP.cpp
  2. 16 3
      SATHTTP/SATHTTP/SATHTTP.h

+ 5 - 1
SATHTTP/SATHTTP/SATHTTP.cpp

@@ -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);

+ 16 - 3
SATHTTP/SATHTTP/SATHTTP.h

@@ -131,6 +131,8 @@ namespace SATHTTP{
 	typedef struct __ST_CASE__
 	{		
 		int _nCaseStep;
+		// 轮数;
+		std::string _strRoundNum;
 		std::string strIndex;			// 用例执行顺序编号(在一个任务中,用例是有执行顺序的);
 		std::string strCaseName;		// 用例名称(脚本名);
 		std::string strMainFilePath;	// 用例下载地址;
@@ -162,6 +164,8 @@ namespace SATHTTP{
 			_nExecutionState = UNEXECUTED;
 			// 默认空;
 			_nExecutionResult = NONE;
+			// 轮数默认为1;
+			_strRoundNum = _T("1");
 		}
 	}STCase, *pSTCase;
 
@@ -205,7 +209,6 @@ namespace SATHTTP{
 		std::string strTaskId;
 		std::string strSoftwareVersion;
 		std::string strMonkeyPctNav;
-		std::vector<STCase> vtCases;
 	}STJob, *pSTJob;
 
 	typedef struct __ST_TASKINFO__
@@ -248,8 +251,17 @@ namespace SATHTTP{
 
 	typedef struct __ST_TASK__
 	{
-		STTaskInfo	taskInfo;
-		STJob		Job;
+		int					_curRound;
+		int					_curCaseIndex;
+		int					_roundSize;			// 1轮有多少用例;
+		int					_roundCount;		// 有多少轮;
+		STTaskInfo			taskInfo;
+		STJob				Job;
+		std::vector<STCase> vtCases;
+		__ST_TASK__(){
+			_curRound = 1;
+			_curCaseIndex = 1;
+		}
 	}STTask, *pSTTask;
 
 	// SAT心跳返回结果;
@@ -352,6 +364,7 @@ namespace SATHTTP{
 		std::string strCaseId;
 		std::string strTaskId;
 		std::string strExecuteId;
+		std::string strRoundNum;	// 轮数:第几轮日志;
 		std::string strUploads;		// 要上传的文件;
 	}STSaveLogReq, *pSTSaveLogReq;