test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: 删除不必要的注释代码（示例）

This commit is contained in:
maninhill 2021-11-17 15:03:40 +08:00 committed by 刘瑞斌
parent 692d58d3a2
commit 935b7bc071
1 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java
View File

@ -128,19 +128,6 @@ public class TestPlanReportService {
return list;
}
// private void checkReport(List<TestPlanReportDTO> list) {
// if(CollectionUtils.isNotEmpty(list)){
// for (TestPlanReportDTO dto : list){
// if(StringUtils.equalsIgnoreCase(dto.getStatus(),TestPlanApiExecuteStatus.RUNNING.name())){
// TestPlanReport model = this.updateTestPlanReportById(dto.getId());
// if(model != null && model.getStatus() != null){
// dto.setStatus(model.getStatus());
// }
// }
// }
// }
// }
public TestPlanScheduleReportInfoDTO genTestPlanReportBySchedule(String projectID, String planId, String userId, String triggerMode) {
Map<String, List<String>> apiTestCaseIdMap = new LinkedHashMap<>();
@ -295,7 +282,6 @@ public class TestPlanReportService {
TestPlanReportExecuteCatch.addApiTestPlanExecuteInfo(testPlanReportID, saveRequest.getUserId(), apiCaseInfoMap, scenarioInfoMap, performanceInfoMap);
// testPlanReport.setPrincipal(testPlan.getPrincipal());
if (testPlanReport.getIsScenarioExecuting() || testPlanReport.getIsApiCaseExecuting() || testPlanReport.getIsPerformanceExecuting()) {
testPlanReport.setStatus(TestPlanReportStatus.RUNNING.name());
} else {
@ -604,10 +590,6 @@ public class TestPlanReportService {
int[] componentIndexArr = new int[]{1, 3, 4};
testPlanReport.setComponents(JSONArray.toJSONString(componentIndexArr));
// QueryTestPlanRequest queryTestPlanRequest = new QueryTestPlanRequest();
// queryTestPlanRequest.setId(testPlanReport.getTestPlanId());
// TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
TestPlanService testPlanService = CommonBeanFactory.getBean(TestPlanService.class);
Map<String, Map<String, String>> testPlanExecuteResult = executeInfo.getExecutedResult();
@ -641,17 +623,6 @@ public class TestPlanReportService {
return testPlanReport;
}
// public void checkTestPlanStatus(String planReportId) {
// try {
// TestPlanReport testPlanReport = testPlanReportMapper.selectByPrimaryKey(planReportId);
//
// TestPlanService testPlanService = CommonBeanFactory.getBean(TestPlanService.class);
// testPlanService.checkStatus(testPlanReport.getTestPlanId());
// } catch (Exception e) {
// LogUtil.error(e.getMessage(), e);
// }
// }
/**
* @param planReportId 测试计划报告ID
* @param resourceRunMode 资源的运行模式,triggerMode非Scedule可以为null
@ -687,7 +658,6 @@ public class TestPlanReportService {
example.createCriteria().andTestPlanReportIdEqualTo(planReportId);
List<TestPlanReportContentWithBLOBs> testPlanReportContentList = testPlanReportContentMapper.selectByExampleWithBLOBs(example);
TestPlanReportContentWithBLOBs testPlanReportContent = null;
TestPlanSimpleReportDTO reportDTO = testPlanService.buildPlanReport(testPlan.getId(), false);
if (!testPlanReportContentList.isEmpty()) {
@ -834,8 +804,6 @@ public class TestPlanReportService {
TestPlanWithBLOBs testPlan = testPlanMapper.selectByPrimaryKey(report.getTestPlanId());
if (testPlan != null) {
testPlanService.checkStatus(testPlan);
// testPlan.setStatus(TestPlanStatus.Completed.name());
// testPlanMapper.updateByPrimaryKeySelective(testPlan);
}
if (testPlan != null && StringUtils.equalsAny(report.getTriggerMode(),
ReportTriggerMode.MANUAL.name(),
@ -872,7 +840,6 @@ public class TestPlanReportService {
subject = Translator.get("task_notification");
}
if (StringUtils.equals(TestPlanReportStatus.FAILED.name(), testPlanReport.getStatus())) {
event = NoticeConstants.Event.EXECUTE_FAILED;
} else {
@ -890,11 +857,9 @@ public class TestPlanReportService {
}
paramMap.putAll(new BeanMap(testPlan));
String successfulMailTemplate = "TestPlanSuccessfulNotification";
String errfoMailTemplate = "TestPlanFailedNotification";
String testPlanShareUrl = shareInfoService.getTestPlanShareUrl(testPlanReport.getId());
paramMap.put("planShareUrl", baseSystemConfigDTO.getUrl() + "/sharePlanReport" + testPlanShareUrl);
@ -1026,9 +991,6 @@ public class TestPlanReportService {
TestPlanReportContentExample contentExample = new TestPlanReportContentExample();
contentExample.createCriteria().andTestPlanReportIdEqualTo(testPlanReportId);
testPlanReportContentMapper.deleteByExample(contentExample);
// TestPlanReportResourceExample resourceExample = new TestPlanReportResourceExample();
// resourceExample.createCriteria().andTestPlanReportIdEqualTo(testPlanReportId);
// testPlanReportResourceService.deleteByExample(resourceExample);
}
}
@ -1056,10 +1018,6 @@ public class TestPlanReportService {
TestPlanReportContentExample contentExample = new TestPlanReportContentExample();
contentExample.createCriteria().andTestPlanReportIdIn(deleteReportIds);
testPlanReportContentMapper.deleteByExample(contentExample);
// TestPlanReportResourceExample resourceExample = new TestPlanReportResourceExample();
// resourceExample.createCriteria().andTestPlanReportIdIn(deleteReportIds);
// testPlanReportResourceService.deleteByExample(resourceExample);
}
}