diff --git a/test-common/pom.xml b/test-common/pom.xml index 9efeb62..40aa3f4 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -151,6 +151,11 @@ json-path 2.8.0 + + com.fatboyindustrial.gson-javatime-serialisers + gson-javatime-serialisers + 1.1.2 + diff --git a/test-test/src/main/java/com/test/test/controller/TestCaseController.java b/test-test/src/main/java/com/test/test/controller/TestCaseController.java index 5c76ce8..f40bb5b 100644 --- a/test-test/src/main/java/com/test/test/controller/TestCaseController.java +++ b/test-test/src/main/java/com/test/test/controller/TestCaseController.java @@ -87,6 +87,7 @@ public class TestCaseController extends BaseController { @PostMapping("/run") public AjaxResult run(@RequestBody IDQO qo) { log.info("执行用例 id:{}, jmeterHomePath:{}", qo.getId(), jmeterHomePath); - return toAjax(testCaseService.executeTestCaseById(qo.getId(), jmeterHomePath)); + testCaseService.executeTestCaseById(qo.getId(), jmeterHomePath); + return toAjax(true); } } 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 044f4bb..baed232 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 @@ -1,6 +1,8 @@ package com.test.test.service.impl; +import com.fatboyindustrial.gsonjavatime.LocalDateTimeConverter; import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.test.common.utils.DateUtils; import com.test.common.utils.JMeterUtil; @@ -24,6 +26,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.lang.reflect.Type; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -257,7 +260,9 @@ public class TestCaseServiceImpl implements ITestCaseService SqlResult sqlResult = new SqlResult(); sqlResult.setColumnNameList(columnNameList); sqlResult.setResultMapList(resultMapList); - Gson gson = new Gson(); + Gson gson = new GsonBuilder() + .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeConverter()) + .create(); testCaseResult.setSqlResult(gson.toJson(sqlResult)); // 处理参数提取 Map assignmentResultMap = new HashMap<>();