resusage优化
This commit is contained in:
parent
90f9066e57
commit
6553f76876
|
@ -18,8 +18,7 @@ public class BuildResult {
|
|||
private String createPodStatus;
|
||||
private String downloadStatus;
|
||||
private String sec_key;
|
||||
private String resUsage;
|
||||
|
||||
|
||||
/**
|
||||
* 步骤。输出分步输出时的步骤
|
||||
*/
|
||||
|
@ -126,12 +125,4 @@ public class BuildResult {
|
|||
this.downloadStatus = downloadStatus;
|
||||
}
|
||||
|
||||
public String getResUsage() {
|
||||
return resUsage;
|
||||
}
|
||||
|
||||
public void setResUsage(String resUsage) {
|
||||
this.resUsage = resUsage;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -365,9 +365,8 @@ public class GameService {
|
|||
createPodStatus = createPodStatus == null ? BuildResultCsts.CREATE_POD_STATUS_SUCCESS: createPodStatus;
|
||||
result.setCreatePodStatus(createPodStatus);
|
||||
|
||||
result.setResUsage(buildResultInJson.getString("resUsage"));
|
||||
ResUsage resUsage = this.buildResUsage(cases, result);
|
||||
processResUsage(result);// 测试集时间已经统计到 case里面,在这里去掉
|
||||
String resUsageStr = buildResultInJson.getString("resUsage");
|
||||
ResUsage resUsage = this.buildResUsage(cases, resUsageStr);
|
||||
|
||||
// 如果编译输出太大,截断
|
||||
int maxLength = Integer.parseInt(appConfig.getOutputSize());
|
||||
|
@ -499,9 +498,8 @@ public class GameService {
|
|||
return tpiRepoPath;
|
||||
}
|
||||
|
||||
private ResUsage buildResUsage(JSONArray cases, BuildResult result) {
|
||||
private ResUsage buildResUsage(JSONArray cases, String resUsageStr) {
|
||||
ResUsage resUsage = new ResUsage();
|
||||
String resUsageStr = result.getResUsage();
|
||||
if (StringUtils.isBlank(resUsageStr)) {
|
||||
List<TestSetUsage> list = new ArrayList<>();
|
||||
for (int i = 0; i < cases.size(); i++) {
|
||||
|
@ -527,20 +525,6 @@ public class GameService {
|
|||
return resUsage;
|
||||
|
||||
}
|
||||
|
||||
private void processResUsage(BuildResult result) {
|
||||
String resUsageStr = result.getResUsage();
|
||||
if (StringUtils.isBlank(resUsageStr)) {
|
||||
|
||||
} else {
|
||||
resUsageStr = Base64Util.decode(resUsageStr);
|
||||
JSONObject resUsageJson = JSONObject.parseObject(resUsageStr);
|
||||
resUsageJson.remove("testSetUsages");
|
||||
resUsageStr = resUsageJson.toJSONString();
|
||||
resUsageStr = Base64Util.encode(resUsageStr);
|
||||
result.setResUsage(resUsageStr);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 分步结果
|
||||
|
|
Loading…
Reference in New Issue