tojson修改为ObjectMapper
This commit is contained in:
@@ -1,14 +1,12 @@
|
|||||||
package com.test.test.service.impl;
|
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.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import com.test.common.utils.DateUtils;
|
import com.test.common.utils.DateUtils;
|
||||||
import com.test.common.utils.JMeterUtil;
|
import com.test.common.utils.JMeterUtil;
|
||||||
import com.test.common.utils.MySQLExecutor;
|
import com.test.common.utils.MySQLExecutor;
|
||||||
import com.test.common.utils.StringUtils;
|
import com.test.common.utils.StringUtils;
|
||||||
import com.test.common.utils.sql.TinyIntTypeAdapter;
|
|
||||||
import com.test.test.domain.TestCase;
|
import com.test.test.domain.TestCase;
|
||||||
import com.test.test.domain.TestCaseResult;
|
import com.test.test.domain.TestCaseResult;
|
||||||
import com.test.test.domain.TestCaseStep;
|
import com.test.test.domain.TestCaseStep;
|
||||||
@@ -27,7 +25,6 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -261,12 +258,14 @@ public class TestCaseServiceImpl implements ITestCaseService
|
|||||||
SqlResult sqlResult = new SqlResult();
|
SqlResult sqlResult = new SqlResult();
|
||||||
sqlResult.setColumnNameList(columnNameList);
|
sqlResult.setColumnNameList(columnNameList);
|
||||||
sqlResult.setResultMapList(resultMapList);
|
sqlResult.setResultMapList(resultMapList);
|
||||||
Gson gson = new GsonBuilder()
|
// Gson gson = new GsonBuilder()
|
||||||
.registerTypeAdapter(Integer.class, new TinyIntTypeAdapter())
|
// .registerTypeAdapter(Integer.class, new TinyIntTypeAdapter())
|
||||||
.registerTypeAdapter(int.class, new TinyIntTypeAdapter())
|
// .registerTypeAdapter(int.class, new TinyIntTypeAdapter())
|
||||||
.registerTypeAdapter(LocalDateTime.class, new LocalDateTimeConverter())
|
// .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeConverter())
|
||||||
.create();
|
// .create();
|
||||||
testCaseResult.setSqlResult(gson.toJson(sqlResult));
|
// testCaseResult.setSqlResult(gson.toJson(sqlResult));
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
testCaseResult.setSqlResult(objectMapper.writeValueAsString(sqlResult));
|
||||||
// 处理参数提取
|
// 处理参数提取
|
||||||
Map<String, String> assignmentResultMap = new HashMap<>();
|
Map<String, String> assignmentResultMap = new HashMap<>();
|
||||||
String assignmentResult = this.dealDataSourceTestCaseStepAssignment(resultMapList, assignmentResultMap, assignment);
|
String assignmentResult = this.dealDataSourceTestCaseStepAssignment(resultMapList, assignmentResultMap, assignment);
|
||||||
|
|||||||
Reference in New Issue
Block a user