diff --git a/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java index f073f93..a802490 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestCaseStepServiceImpl.java @@ -1,5 +1,6 @@ package com.test.test.service.impl; +import com.test.common.core.domain.model.JmeterRequest; import com.test.common.utils.DateUtils; import com.test.common.utils.JMeterUtil; import com.test.test.domain.TestCaseStep; @@ -99,6 +100,17 @@ public class TestCaseStepServiceImpl implements ITestCaseStepService return testCaseStepMapper.deleteTestCaseStepById(id); } + /** + * 根据用例id查询用例步骤列表并按照步骤顺序排序 + * + * @param caseId 用例id + * @return 用例步骤集合 + */ + @Override + public List selectTestCaseStepListByCaseId(Long caseId) { + return testCaseStepMapper.selectTestCaseStepListByCaseId(caseId); + } + /** * 执行jmeter用例步骤计划 * @@ -119,8 +131,16 @@ public class TestCaseStepServiceImpl implements ITestCaseStepService log.error("不支持的请求方式:{}", method); return null; } - String requestHeader = testCaseStep.getRequestHeader(); - Map resultMap = JMeterUtil.getJmeterResult(id, url, testCaseStep.getApiPort(), testCaseStep.getRequestMethod(), testCaseStep.getRequestParams(), requestHeader, jmeterHomePath); + JmeterRequest jmeterRequest = new JmeterRequest(); + jmeterRequest.setId(id); + jmeterRequest.setUrl(url); + jmeterRequest.setPort(testCaseStep.getApiPort()); + jmeterRequest.setMethod(testCaseStep.getRequestMethod()); + jmeterRequest.setRequestBody(testCaseStep.getRequestBody()); + jmeterRequest.setRequestParams(testCaseStep.getRequestParams()); + jmeterRequest.setRequestHeader(testCaseStep.getRequestHeader()); + jmeterRequest.setJmeterHomePath(jmeterHomePath); + Map resultMap = JMeterUtil.getJmeterResult(jmeterRequest); return resultMap; }