From 6fb520ce382ff161940f97ddfdea74579bd4daa1 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 20 Jul 2022 18:17:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=9C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=87=8F=E5=B0=91=E5=92=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiScenarioReportResultService.java | 66 +---------- .../api/service/ApiScenarioReportService.java | 105 +++++++----------- .../api/service/TestResultService.java | 3 + .../service/utils/ResultConversionUtil.java | 89 +++++++++++++++ 4 files changed, 139 insertions(+), 124 deletions(-) create mode 100644 backend/src/main/java/io/metersphere/api/service/utils/ResultConversionUtil.java diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java index 43beb26745..79620fc3a6 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java @@ -1,13 +1,8 @@ package io.metersphere.api.service; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import io.metersphere.api.dto.ApiScenarioReportBaseInfoDTO; -import io.metersphere.api.dto.ErrorReportLibraryParseDTO; +import io.metersphere.api.service.utils.ResultConversionUtil; import io.metersphere.base.domain.ApiScenarioReportResultWithBLOBs; import io.metersphere.base.mapper.ApiScenarioReportResultMapper; -import io.metersphere.commons.constants.ExecuteResult; -import io.metersphere.commons.utils.ErrorReportLibraryUtil; import io.metersphere.dto.RequestResult; import io.metersphere.dto.ResultDTO; import io.metersphere.utils.LoggerUtil; @@ -21,9 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.UUID; @Service @Transactional(rollbackFor = Exception.class) @@ -41,7 +34,7 @@ public class ApiScenarioReportResultService { if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) { LoggerUtil.debug("合并事物请求暂不入库"); } else { - apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, item)); + apiScenarioReportResultMapper.insert(ResultConversionUtil.getApiScenarioReportResultBLOBs(reportId, item)); } }); } else { @@ -49,7 +42,7 @@ public class ApiScenarioReportResultService { ApiScenarioReportResultMapper batchMapper = sqlSession.getMapper(ApiScenarioReportResultMapper.class); queue.forEach(item -> { if (StringUtils.isEmpty(item.getName()) || !item.getName().startsWith("Transaction=") || !CollectionUtils.isEmpty(item.getSubRequestResults())) { - batchMapper.insert(this.newApiScenarioReportResult(reportId, item)); + batchMapper.insert(ResultConversionUtil.getApiScenarioReportResultBLOBs(reportId, item)); } }); sqlSession.flushStatements(); @@ -66,7 +59,7 @@ public class ApiScenarioReportResultService { // 单条储存 RequestResult requestResult = dtos.get(0).getRequestResults().get(0); if (StringUtils.isEmpty(requestResult.getName()) || !requestResult.getName().startsWith("Transaction=") || !CollectionUtils.isEmpty(requestResult.getSubRequestResults())) { - apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(dtos.get(0).getReportId(), requestResult)); + apiScenarioReportResultMapper.insert(ResultConversionUtil.getApiScenarioReportResultBLOBs(dtos.get(0).getReportId(), requestResult)); } } else { SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); @@ -75,7 +68,7 @@ public class ApiScenarioReportResultService { if (CollectionUtils.isNotEmpty(dto.getRequestResults())) { dto.getRequestResults().forEach(item -> { if (StringUtils.isEmpty(item.getName()) || !item.getName().startsWith("Transaction=") || !CollectionUtils.isEmpty(item.getSubRequestResults())) { - batchMapper.insert(this.newApiScenarioReportResult(dto.getReportId(), item)); + batchMapper.insert(ResultConversionUtil.getApiScenarioReportResultBLOBs(dto.getReportId(), item)); } }); } @@ -89,53 +82,6 @@ public class ApiScenarioReportResultService { } public ApiScenarioReportResultWithBLOBs newScenarioReportResult(String reportId, String resourceId) { - ApiScenarioReportResultWithBLOBs report = new ApiScenarioReportResultWithBLOBs(); - report.setId(UUID.randomUUID().toString()); - report.setResourceId(resourceId); - report.setReportId(reportId); - report.setTotalAssertions(0L); - report.setPassAssertions(0L); - report.setCreateTime(System.currentTimeMillis()); - return report; - } - - //记录基础信息 - private ApiScenarioReportBaseInfoDTO getBaseInfo(RequestResult result) { - ApiScenarioReportBaseInfoDTO baseInfoDTO = new ApiScenarioReportBaseInfoDTO(); - baseInfoDTO.setReqName(result.getName()); - baseInfoDTO.setReqSuccess(result.isSuccess()); - baseInfoDTO.setReqError(result.getError()); - baseInfoDTO.setReqStartTime(result.getStartTime()); - if (result.getResponseResult() != null) { - baseInfoDTO.setRspCode(result.getResponseResult().getResponseCode()); - baseInfoDTO.setRspTime(result.getResponseResult().getResponseTime()); - } - return baseInfoDTO; - } - - private ApiScenarioReportResultWithBLOBs newApiScenarioReportResult(String reportId, RequestResult baseResult) { - //解析误报内容 - ErrorReportLibraryParseDTO errorCodeDTO = ErrorReportLibraryUtil.parseAssertions(baseResult); - RequestResult result = errorCodeDTO.getResult(); - String resourceId = result.getResourceId(); - - ApiScenarioReportResultWithBLOBs report = newScenarioReportResult(reportId, resourceId); - report.setTotalAssertions(Long.parseLong(result.getTotalAssertions() + "")); - report.setPassAssertions(Long.parseLong(result.getPassAssertions() + "")); - String status = result.getError() == 0 ? ExecuteResult.SCENARIO_SUCCESS.toString() : ExecuteResult.SCENARIO_ERROR.toString(); - if (CollectionUtils.isNotEmpty(errorCodeDTO.getErrorCodeList())) { - report.setErrorCode(errorCodeDTO.getErrorCodeStr()); - } - if (StringUtils.equalsIgnoreCase(errorCodeDTO.getRequestStatus(), ExecuteResult.ERROR_REPORT_RESULT.toString())) { - status = errorCodeDTO.getRequestStatus(); - } - report.setStatus(status); - report.setRequestTime(result.getEndTime() - result.getStartTime()); - - report.setBaseInfo(JSONObject.toJSONString(getBaseInfo(result))); - report.setContent(JSON.toJSONString(result).getBytes(StandardCharsets.UTF_8)); - - LoggerUtil.info("报告ID [ " + reportId + " ] 执行请求：【 " + baseResult.getName() + "】 入库存储"); - return report; + return ResultConversionUtil.newScenarioReportResult(reportId, resourceId); } } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java index 089457efe8..1cc5779f38 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java @@ -98,7 +98,6 @@ public class ApiScenarioReportService { apiScenarioReportResultService.save(dto.getReportId(), dto.getRequestResults()); } - public void batchSaveResult(List dtos) { apiScenarioReportResultService.batchSave(dtos); } @@ -113,19 +112,18 @@ public class ApiScenarioReportService { // 更新控制台信息 apiScenarioReportStructureService.update(dto.getReportId(), dto.getConsole()); } - ApiScenarioReportResultExample example = new ApiScenarioReportResultExample(); - example.createCriteria().andReportIdEqualTo(dto.getReportId()); - List requestResults = apiScenarioReportResultMapper.selectByExample(example); - + // 优化当前执行携带结果作为状态判断依据 ApiScenarioReport scenarioReport; if (StringUtils.equals(dto.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) { - scenarioReport = updatePlanCase(requestResults, dto); + scenarioReport = updatePlanCase(dto); } else if (StringUtils.equalsAny(dto.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO_PLAN.name(), ApiRunMode.JENKINS_SCENARIO_PLAN.name())) { - scenarioReport = updateSchedulePlanCase(requestResults, dto); + scenarioReport = updateSchedulePlanCase(dto); } else if (dto.getRunMode().startsWith("UI")) { - scenarioReport = updateUiScenario(requestResults, dto); + ApiScenarioReportResultExample example = new ApiScenarioReportResultExample(); + example.createCriteria().andReportIdEqualTo(dto.getReportId()); + scenarioReport = updateUiScenario(apiScenarioReportResultMapper.selectByExample(example), dto); } else { - scenarioReport = updateScenario(requestResults, dto); + scenarioReport = updateScenario(dto); } // 串行队列 return scenarioReport; @@ -247,7 +245,7 @@ public class ApiScenarioReportService { if (StringUtils.equals(reportType, RunModeConstants.SET_REPORT.toString())) { return report; } - if (runMode.equals("CASE")) { + if (StringUtils.equals(runMode, "CASE")) { report.setTriggerMode(TriggerMode.MANUAL.name()); } report.setStatus(status); @@ -288,24 +286,19 @@ public class ApiScenarioReportService { return report; } - public ApiScenarioReport updatePlanCase(List requestResults, ResultDTO dto) { - long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Error.name())).count(); - String status = getStatus(requestResults, dto); + public ApiScenarioReport updatePlanCase(ResultDTO dto) { + String status = getStatus(dto); ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode()); TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(dto.getTestId()); if (testPlanApiScenario != null) { if (report != null) { testPlanApiScenario.setLastResult(report.getStatus()); } else { - if (errorSize > 0) { - testPlanApiScenario.setLastResult(ScenarioStatus.Fail.name()); - } else { - testPlanApiScenario.setLastResult(ScenarioStatus.Success.name()); - } + testPlanApiScenario.setLastResult(status); } - long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); + long successSize = dto.getRequestResults().stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); - String passRate = new DecimalFormat("0%").format((float) successSize / requestResults.size()); + String passRate = new DecimalFormat("0%").format((float) successSize / dto.getRequestResults().size()); testPlanApiScenario.setPassRate(passRate); testPlanApiScenario.setReportId(dto.getReportId()); testPlanApiScenario.setUpdateTime(System.currentTimeMillis()); @@ -317,7 +310,8 @@ public class ApiScenarioReportService { // 更新场景状态 ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId()); if (scenario != null) { - scenario.setLastResult(errorSize > 0 ? "Fail" : ScenarioStatus.Success.name()); + scenario.setLastResult(StringUtils.endsWithIgnoreCase(status, ScenarioStatus.Error.name()) + ? ScenarioStatus.Fail.name() : status); scenario.setPassRate(passRate); scenario.setReportId(dto.getReportId()); int executeTimes = 0; @@ -332,12 +326,11 @@ public class ApiScenarioReportService { return report; } - public ApiScenarioReport updateSchedulePlanCase(List requestResults, ResultDTO dto) { + public ApiScenarioReport updateSchedulePlanCase(ResultDTO dto) { List testPlanReportIdList = new ArrayList<>(); StringBuilder scenarioNames = new StringBuilder(); - long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Error.name())).count(); - String status = getStatus(requestResults, dto); + String status = getStatus(dto); ApiScenarioReportWithBLOBs report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode()); if (report != null) { if (StringUtils.isNotEmpty(dto.getTestPlanReportId()) && !testPlanReportIdList.contains(dto.getTestPlanReportId())) { @@ -349,8 +342,8 @@ public class ApiScenarioReportService { report.setEndTime(System.currentTimeMillis()); apiScenarioReportMapper.updateByPrimaryKeySelective(report); testPlanApiScenario.setLastResult(report.getStatus()); - long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); - String passRate = new DecimalFormat("0%").format((float) successSize / requestResults.size()); + long successSize = dto.getRequestResults().stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); + String passRate = new DecimalFormat("0%").format((float) successSize / dto.getRequestResults().size()); testPlanApiScenario.setPassRate(passRate); testPlanApiScenario.setReportId(report.getId()); @@ -362,11 +355,8 @@ public class ApiScenarioReportService { // 更新场景状态 ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId()); if (scenario != null) { - if (errorSize > 0) { - scenario.setLastResult("Fail"); - } else { - scenario.setLastResult(ScenarioStatus.Success.name()); - } + scenario.setLastResult(StringUtils.endsWithIgnoreCase(status, ScenarioStatus.Error.name()) + ? ScenarioStatus.Fail.name() : status); scenario.setPassRate(passRate); scenario.setReportId(report.getId()); int executeTimes = 0; @@ -374,7 +364,6 @@ public class ApiScenarioReportService { executeTimes = scenario.getExecuteTimes().intValue(); } scenario.setExecuteTimes(executeTimes + 1); - apiScenarioMapper.updateByPrimaryKey(scenario); } } @@ -450,11 +439,9 @@ public class ApiScenarioReportService { } } - public ApiScenarioReport updateScenario(List requestResults, ResultDTO dto) { - long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Error.name())).count(); + public ApiScenarioReport updateScenario(ResultDTO dto) { // 更新报告状态 - String status = getStatus(requestResults, dto); - + String status = getStatus(dto); ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode()); // 更新场景状态 ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(dto.getTestId()); @@ -462,17 +449,13 @@ public class ApiScenarioReportService { scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId()); } if (scenario != null) { - if (StringUtils.equalsAnyIgnoreCase(status, ExecuteResult.ERROR_REPORT_RESULT.toString())) { - scenario.setLastResult(status); - } else { - scenario.setLastResult(errorSize > 0 ? "Fail" : ScenarioStatus.Success.name()); - } - - long successSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); - if (requestResults.size() == 0) { + scenario.setLastResult(StringUtils.endsWithIgnoreCase(status, ScenarioStatus.Error.name()) + ? ScenarioStatus.Fail.name() : status); + long successSize = dto.getRequestResults().stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Success.name())).count(); + if (dto.getRequestResults().size() == 0) { scenario.setPassRate("0%"); } else { - scenario.setPassRate(new DecimalFormat("0%").format((float) successSize / requestResults.size())); + scenario.setPassRate(new DecimalFormat("0%").format((float) successSize / dto.getRequestResults().size())); } scenario.setReportId(dto.getReportId()); @@ -494,7 +477,7 @@ public class ApiScenarioReportService { public ApiScenarioReport updateUiScenario(List requestResults, ResultDTO dto) { long errorSize = requestResults.stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Error.name())).count(); // 更新报告状态 - String status = getStatus(requestResults, dto); + String status = getStatus(dto); ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode()); // 更新场景状态 @@ -539,11 +522,6 @@ public class ApiScenarioReportService { testPlanUiScenario.setUpdateTime(System.currentTimeMillis()); testPlanUiScenarioMapper.updateByPrimaryKeySelective(testPlanUiScenario); } - -// // 发送通知 -// if (scenario != null && report != null) { -// sendNotice(scenario, report); -// } return report; } @@ -919,25 +897,24 @@ public class ApiScenarioReportService { return report; } - private String getStatus(List requestResults, ResultDTO dto) { - long errorSize = 0; - long errorReportResultSize = 0; - for (ApiScenarioReportResult result : requestResults) { - if (StringUtils.equalsIgnoreCase(result.getStatus(), ScenarioStatus.Error.name())) { - errorSize++; - } else if (StringUtils.equalsIgnoreCase(result.getStatus(), ExecuteResult.ERROR_REPORT_RESULT.toString())) { - errorReportResultSize++; - } + private String getStatus(ResultDTO dto) { + if (MapUtils.isNotEmpty(dto.getArbitraryData()) && dto.getArbitraryData().containsKey("REPORT_STATUS")) { + // 资源池执行整体传输失败，单条传输内容，获取资源池执行统计的状态 + return String.valueOf(dto.getArbitraryData().get("REPORT_STATUS")); } - String status;//增加误报状态判断 + long errorSize = dto.getRequestResults().stream().filter(requestResult -> + StringUtils.equalsIgnoreCase(requestResult.getStatus(), ScenarioStatus.Error.name())).count(); + + long errorReportResultSize = dto.getRequestResults().stream().filter(requestResult -> + StringUtils.equalsIgnoreCase(requestResult.getStatus(), ExecuteResult.ERROR_REPORT_RESULT.toString())).count(); + + String status = dto.getRequestResults().isEmpty() ? ExecuteResult.UN_EXECUTE.toString() : ScenarioStatus.Success.name(); if (errorSize > 0) { status = ScenarioStatus.Error.name(); } else if (errorReportResultSize > 0) { status = ExecuteResult.ERROR_REPORT_RESULT.toString(); - } else { - status = requestResults.isEmpty() ? ExecuteResult.UN_EXECUTE.toString() : ScenarioStatus.Success.name(); } - + // 超时状态 if (dto != null && dto.getArbitraryData() != null && dto.getArbitraryData().containsKey("TIMEOUT") && (Boolean) dto.getArbitraryData().get("TIMEOUT")) { LoggerUtil.info("资源 " + dto.getTestId() + " 执行超时", dto.getReportId()); status = ScenarioStatus.Timeout.name(); diff --git a/backend/src/main/java/io/metersphere/api/service/TestResultService.java b/backend/src/main/java/io/metersphere/api/service/TestResultService.java index 85521bec68..59f0761e0b 100644 --- a/backend/src/main/java/io/metersphere/api/service/TestResultService.java +++ b/backend/src/main/java/io/metersphere/api/service/TestResultService.java @@ -166,6 +166,9 @@ public class TestResultService { if (StringUtils.equals(dto.getRunType(), RunModeConstants.SERIAL.toString())) { redisTemplate.delete(RunModeConstants.SERIAL.name() + "_" + dto.getReportId()); } + if (dto.getRequestResults() == null) { + dto.setRequestResults(new LinkedList<>()); + } if (scenarioRunModes.contains(dto.getRunMode()) || dto.getRunMode().startsWith("UI")) { ApiScenarioReport scenarioReport = apiScenarioReportService.testEnded(dto); if (scenarioReport != null) { diff --git a/backend/src/main/java/io/metersphere/api/service/utils/ResultConversionUtil.java b/backend/src/main/java/io/metersphere/api/service/utils/ResultConversionUtil.java new file mode 100644 index 0000000000..18ea388169 --- /dev/null +++ b/backend/src/main/java/io/metersphere/api/service/utils/ResultConversionUtil.java @@ -0,0 +1,89 @@ +package io.metersphere.api.service.utils; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import io.metersphere.api.dto.ApiScenarioReportBaseInfoDTO; +import io.metersphere.api.dto.ErrorReportLibraryParseDTO; +import io.metersphere.base.domain.ApiScenarioReportResult; +import io.metersphere.base.domain.ApiScenarioReportResultWithBLOBs; +import io.metersphere.commons.constants.ExecuteResult; +import io.metersphere.commons.utils.ErrorReportLibraryUtil; +import io.metersphere.dto.RequestResult; +import io.metersphere.utils.LoggerUtil; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; + +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; + +public class ResultConversionUtil { + + public static List getApiScenarioReportResults(String reportId, List requestResults) { + //解析误报内容 + List list = new LinkedList<>(); + if (CollectionUtils.isEmpty(requestResults)) { + return list; + } + requestResults.forEach(item -> { + list.add(getApiScenarioReportResult(reportId, item)); + }); + return list; + } + + public static ApiScenarioReportResultWithBLOBs getApiScenarioReportResult(String reportId, RequestResult requestResult) { + //解析误报内容 + ErrorReportLibraryParseDTO errorCodeDTO = ErrorReportLibraryUtil.parseAssertions(requestResult); + RequestResult result = errorCodeDTO.getResult(); + String resourceId = result.getResourceId(); + + ApiScenarioReportResultWithBLOBs report = newScenarioReportResult(reportId, resourceId); + report.setTotalAssertions(Long.parseLong(result.getTotalAssertions() + "")); + report.setPassAssertions(Long.parseLong(result.getPassAssertions() + "")); + String status = result.getError() == 0 ? ExecuteResult.SCENARIO_SUCCESS.toString() : ExecuteResult.SCENARIO_ERROR.toString(); + if (CollectionUtils.isNotEmpty(errorCodeDTO.getErrorCodeList())) { + report.setErrorCode(errorCodeDTO.getErrorCodeStr()); + } + if (StringUtils.equalsIgnoreCase(errorCodeDTO.getRequestStatus(), ExecuteResult.ERROR_REPORT_RESULT.toString())) { + status = errorCodeDTO.getRequestStatus(); + } + requestResult.setStatus(status); + report.setStatus(status); + report.setRequestTime(result.getEndTime() - result.getStartTime()); + LoggerUtil.info("报告ID [ " + reportId + " ] 执行请求：【 " + requestResult.getName() + "】 入库存储"); + return report; + } + + public static ApiScenarioReportResultWithBLOBs getApiScenarioReportResultBLOBs(String reportId, RequestResult result) { + ApiScenarioReportResultWithBLOBs report = getApiScenarioReportResult(reportId, result); + report.setBaseInfo(JSONObject.toJSONString(getBaseInfo(result))); + report.setContent(JSON.toJSONString(result).getBytes(StandardCharsets.UTF_8)); + return report; + } + + //记录基础信息 + private static ApiScenarioReportBaseInfoDTO getBaseInfo(RequestResult result) { + ApiScenarioReportBaseInfoDTO baseInfoDTO = new ApiScenarioReportBaseInfoDTO(); + baseInfoDTO.setReqName(result.getName()); + baseInfoDTO.setReqSuccess(result.isSuccess()); + baseInfoDTO.setReqError(result.getError()); + baseInfoDTO.setReqStartTime(result.getStartTime()); + if (result.getResponseResult() != null) { + baseInfoDTO.setRspCode(result.getResponseResult().getResponseCode()); + baseInfoDTO.setRspTime(result.getResponseResult().getResponseTime()); + } + return baseInfoDTO; + } + + public static ApiScenarioReportResultWithBLOBs newScenarioReportResult(String reportId, String resourceId) { + ApiScenarioReportResultWithBLOBs report = new ApiScenarioReportResultWithBLOBs(); + report.setId(UUID.randomUUID().toString()); + report.setResourceId(resourceId); + report.setReportId(reportId); + report.setTotalAssertions(0L); + report.setPassAssertions(0L); + report.setCreateTime(System.currentTimeMillis()); + return report; + } +}