From 5d8cc5466893b6d2b269579202285158e0c40d9b Mon Sep 17 00:00:00 2001
From: liangdaliang <liangdaliang@wondersoft.cn>
Date: Mon, 10 Mar 2025 11:27:02 +0800
Subject: [PATCH] =?UTF-8?q?sql=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9E=9C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/service/impl/TestCaseServiceImpl.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java
index d6c5144..08e6322 100644
--- a/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java
+++ b/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java
@@ -185,10 +185,10 @@ public class TestCaseServiceImpl implements ITestCaseService
      * @return 成功或失败
      */
     private boolean doHttpRequestTest(TestCase testCase, TestCaseStep testCaseStep, String jmeterHomePath) {
+        TestCaseResult testCaseResult = new TestCaseResult();
         try {
             String assignment = testCaseStep.getAssignment(); // 参数提取
             String assertion = testCaseStep.getAssertion(); // 校验规则
-            TestCaseResult testCaseResult = new TestCaseResult();
             testCaseResult.setExecuteTime(DateUtils.getNowDate());
             Map<String, String> resultMap = testCaseStepService.executeJmeterTestCaseStepById(testCaseStep.getId(), jmeterHomePath);
             testCaseResult.setCaseId(testCase.getId());
@@ -226,6 +226,9 @@ public class TestCaseServiceImpl implements ITestCaseService
             }
         } catch (Exception e) {
             log.error("HTTP请求测试发生异常: ", e);
+            testCaseResult.setUseTime(0L);
+            testCaseResult.setStatus("失败");
+            testCaseResultMapper.insertTestCaseResult(testCaseResult);
             return false;
         }
         return true;
@@ -238,11 +241,13 @@ public class TestCaseServiceImpl implements ITestCaseService
      * @return 成功或失败
      */
     private boolean doDateSourceRequestTest(TestCase testCase, TestCaseStep testCaseStep) {
+        TestCaseResult testCaseResult = new TestCaseResult();
         try {
             String assignment = testCaseStep.getAssignment(); // 参数提取
             String assertion = testCaseStep.getAssertion(); // 校验规则
-            TestCaseResult testCaseResult = new TestCaseResult();
             testCaseResult.setExecuteTime(DateUtils.getNowDate());
+            testCaseResult.setCaseId(testCase.getId());
+            testCaseResult.setStepId(testCaseStep.getId());
             Long startTime = System.currentTimeMillis();
             TestDatasource testDatasource = testDatasourceMapper.selectTestDatasourceById(testCaseStep.getDatasourceId());
             Long useTime = System.currentTimeMillis() - startTime;
@@ -255,8 +260,6 @@ public class TestCaseServiceImpl implements ITestCaseService
             List<String> columnNameList = new ArrayList<>();
             // 获取所有sql查询集合对象
             List<Map<String, Object>> resultMapList = MySQLExecutor.executeQuery(testCaseStep.getSqlCommand(), url, testDatasource.getUsername(), testDatasource.getPassword(), columnNameList);
-            testCaseResult.setCaseId(testCase.getId());
-            testCaseResult.setStepId(testCaseStep.getId());
             if (!CollectionUtils.isEmpty(resultMapList)) {
                 SqlResult sqlResult = new SqlResult();
                 sqlResult.setColumnNameList(columnNameList);
@@ -290,6 +293,9 @@ public class TestCaseServiceImpl implements ITestCaseService
             }
         } catch (Exception e) {
             log.error("数据源请求测试发生异常: ", e);
+            testCaseResult.setSqlResult("数据源请求测试发生异常: " + e.getMessage());
+            testCaseResult.setStatus("失败");
+            testCaseResultMapper.insertTestCaseResult(testCaseResult);
             return false;
         }
         return true;