From 9d95f7b665b72672904385bcbf634244b1216ae2 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 29 Jun 2020 15:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=80=A7=E8=83=BD=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=89=8D=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E6=9C=89?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=81=94=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PerformanceTestService.java | 16 ++++++++++++++++ .../resources/i18n/messages_en_US.properties | 2 ++ .../resources/i18n/messages_zh_CN.properties | 2 ++ .../resources/i18n/messages_zh_TW.properties | 2 ++ 4 files changed, 22 insertions(+) diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java index 87da37f9f6..a9ba2f5d91 100644 --- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java @@ -68,6 +68,8 @@ public class PerformanceTestService { private ReportService reportService; @Resource private KafkaProperties kafkaProperties; + @Resource + private TestCaseMapper testCaseMapper; public List list(QueryTestPlanRequest request) { request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); @@ -76,6 +78,20 @@ public class PerformanceTestService { public void delete(DeleteTestPlanRequest request) { String testId = request.getId(); + + // 是否关联测试用例 + TestCaseExample testCaseExample = new TestCaseExample(); + testCaseExample.createCriteria().andTestIdEqualTo(testId); + List testCases = testCaseMapper.selectByExample(testCaseExample); + if (testCases.size() > 0) { + String caseName = ""; + for (int i = 0; i < testCases.size(); i++) { + caseName = caseName + testCases.get(i).getName() + ","; + } + caseName = caseName.substring(0, caseName.length() - 1); + MSException.throwException(Translator.get("related_case_del_fail_prefix") + caseName + Translator.get("related_case_del_fail_suffix")); + } + LoadTestReportExample loadTestReportExample = new LoadTestReportExample(); loadTestReportExample.createCriteria().andTestIdEqualTo(testId); List loadTestReports = loadTestReportMapper.selectByExample(loadTestReportExample); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 00701a76ea..8a2549cbbe 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -42,6 +42,8 @@ load_test_already_exists=Duplicate load test name no_nodes_message=No node message duplicate_node_ip=Duplicate IPs max_thread_insufficient=The number of concurrent users exceeds +related_case_del_fail_prefix=Connected to +related_case_del_fail_suffix=TestCase, please disassociate first #workspace workspace_name_is_null=Workspace name cannot be null workspace_name_already_exists=The workspace name already exists diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 4605816ba7..e1d701c20a 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -42,6 +42,8 @@ load_test_already_exists=测试名称不能重复 no_nodes_message=没有节点信息 duplicate_node_ip=节点 IP 重复 max_thread_insufficient=并发用户数超额 +related_case_del_fail_prefix=已关联到 +related_case_del_fail_suffix=测试用例，请先解除关联 #workspace workspace_name_is_null=工作空间名不能为空 workspace_name_already_exists=工作空间名已存在 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 265ae7182f..a2a045972a 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -42,6 +42,8 @@ load_test_already_exists=測試名稱不能重復 no_nodes_message=沒有節點信息 duplicate_node_ip=節點 IP 重復 max_thread_insufficient=並發用戶數超額 +related_case_del_fail_prefix=已關聯到 +related_case_del_fail_suffix=測試用例，請先解除關聯 #workspace workspace_name_is_null=工作空間名不能為空 workspace_name_already_exists=工作空間名已存在