From 3bca275ca8d47008c6d3ca7c4da848065f19ddaa Mon Sep 17 00:00:00 2001 From: liangdaliang Date: Thu, 20 Feb 2025 16:23:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E3=80=81=E8=BD=AE=E8=AF=A2?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TestCaseStepServiceImpl.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) 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; }