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 92d7178..0614666 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,14 +1,12 @@ package com.test.test.service.impl; -import com.fatboyindustrial.gsonjavatime.LocalDateTimeConverter; +import com.fasterxml.jackson.databind.ObjectMapper; 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; import com.test.common.utils.MySQLExecutor; import com.test.common.utils.StringUtils; -import com.test.common.utils.sql.TinyIntTypeAdapter; import com.test.test.domain.TestCase; import com.test.test.domain.TestCaseResult; import com.test.test.domain.TestCaseStep; @@ -27,7 +25,6 @@ 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; @@ -261,12 +258,14 @@ public class TestCaseServiceImpl implements ITestCaseService SqlResult sqlResult = new SqlResult(); sqlResult.setColumnNameList(columnNameList); sqlResult.setResultMapList(resultMapList); - Gson gson = new GsonBuilder() - .registerTypeAdapter(Integer.class, new TinyIntTypeAdapter()) - .registerTypeAdapter(int.class, new TinyIntTypeAdapter()) - .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeConverter()) - .create(); - testCaseResult.setSqlResult(gson.toJson(sqlResult)); +// Gson gson = new GsonBuilder() +// .registerTypeAdapter(Integer.class, new TinyIntTypeAdapter()) +// .registerTypeAdapter(int.class, new TinyIntTypeAdapter()) +// .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeConverter()) +// .create(); +// testCaseResult.setSqlResult(gson.toJson(sqlResult)); + ObjectMapper objectMapper = new ObjectMapper(); + testCaseResult.setSqlResult(objectMapper.writeValueAsString(sqlResult)); // 处理参数提取 Map assignmentResultMap = new HashMap<>(); String assignmentResult = this.dealDataSourceTestCaseStepAssignment(resultMapList, assignmentResultMap, assignment);