test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(功能用例): 导入用例创建的模块创建人字段为空

This commit is contained in:
chenjianxing 2022-01-27 13:54:32 +08:00 committed by 刘瑞斌
parent 2f99722238
commit 489aaa39e0
4 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
View File

@ -467,6 +467,7 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
node.setCreateTime(System.currentTimeMillis()); node.setCreateTime(System.currentTimeMillis());
node.setUpdateTime(System.currentTimeMillis()); node.setUpdateTime(System.currentTimeMillis());
node.setId(UUID.randomUUID().toString()); node.setId(UUID.randomUUID().toString());
node.setCreateUser(SessionUtils.getUserId());
apiModuleMapper.insertSelective(node); apiModuleMapper.insertSelective(node);
return node; return node;
} }
@ -538,6 +539,7 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
record.setCreateTime(System.currentTimeMillis()); record.setCreateTime(System.currentTimeMillis());
record.setUpdateTime(System.currentTimeMillis()); record.setUpdateTime(System.currentTimeMillis());
record.setProjectId(projectId); record.setProjectId(projectId);
record.setCreateUser(SessionUtils.getUserId());
apiModuleMapper.insert(record); apiModuleMapper.insert(record);
return record; return record;
}else { }else {

1
backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
View File

@ -465,6 +465,7 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
record.setCreateTime(System.currentTimeMillis()); record.setCreateTime(System.currentTimeMillis());
record.setUpdateTime(System.currentTimeMillis()); record.setUpdateTime(System.currentTimeMillis());
record.setProjectId(projectId); record.setProjectId(projectId);
record.setCreateUser(SessionUtils.getUserId());
apiScenarioModuleMapper.insert(record); apiScenarioModuleMapper.insert(record);
return record; return record;
}else { }else {

1
backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java
View File

@ -404,7 +404,6 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener<Map<Integ
testCase.setTags(modifiedTags); testCase.setTags(modifiedTags);
testCase.setType("functional"); testCase.setType("functional");
JSONArray customArr = new JSONArray();
String caseStatusValue = ""; String caseStatusValue = "";
if (StringUtils.equalsAnyIgnoreCase(data.getStatus(), "Underway", "进行中", "進行中")) { if (StringUtils.equalsAnyIgnoreCase(data.getStatus(), "Underway", "进行中", "進行中")) {
caseStatusValue = "Underway"; caseStatusValue = "Underway";

27
backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
View File

@ -125,7 +125,6 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
List<TestCaseNode> list = testCaseNodeMapper.selectByExample(example); List<TestCaseNode> list = testCaseNodeMapper.selectByExample(example);
if(CollectionUtils.isEmpty(list)){ if(CollectionUtils.isEmpty(list)){
NodeNumDTO record = new NodeNumDTO(); NodeNumDTO record = new NodeNumDTO();
//TestCaseNode record = new TestCaseNode();
record.setId(UUID.randomUUID().toString()); record.setId(UUID.randomUUID().toString());
record.setCreateUser(SessionUtils.getUserId()); record.setCreateUser(SessionUtils.getUserId());
record.setName("未规划用例"); record.setName("未规划用例");
@ -144,34 +143,11 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
public List<TestCaseNodeDTO> getNodeTreeByProjectId(String projectId) { public List<TestCaseNodeDTO> getNodeTreeByProjectId(String projectId) {
// 判断当前项目下是否有默认模块，没有添加默认模块 // 判断当前项目下是否有默认模块，没有添加默认模块
this.getDefaultNode(projectId); this.getDefaultNode(projectId);
// TestCaseNodeExample example = new TestCaseNodeExample();
// example.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo("默认模块");
// long count = testCaseNodeMapper.countByExample(example);
// if (count <= 0) {
// NodeNumDTO record = new NodeNumDTO();
// //TestCaseNode record = new TestCaseNode();
// record.setId(UUID.randomUUID().toString());
// record.setCreateUser(SessionUtils.getUserId());
// record.setName("默认模块");
// record.setPos(1.0);
// record.setLevel(1);
// record.setCreateTime(System.currentTimeMillis());
// record.setUpdateTime(System.currentTimeMillis());
// record.setProjectId(projectId);
// testCaseNodeMapper.insert(record);
// record.setCaseNum(0);
// }
List<TestCaseNodeDTO> testCaseNodes = extTestCaseNodeMapper.getNodeTreeByProjectId(projectId); List<TestCaseNodeDTO> testCaseNodes = extTestCaseNodeMapper.getNodeTreeByProjectId(projectId);
QueryTestCaseRequest request = new QueryTestCaseRequest(); QueryTestCaseRequest request = new QueryTestCaseRequest();
request.setUserId(SessionUtils.getUserId()); request.setUserId(SessionUtils.getUserId());
request.setProjectId(projectId); request.setProjectId(projectId);
// for (TestCaseNodeDTO node : testCaseNodes) {
// List<String> nodeIds = new ArrayList<>();
// nodeIds = this.nodeList(testCaseNodes, node.getId(), nodeIds);
// nodeIds.add(node.getId());
// request.setNodeIds(nodeIds);
// node.setCaseNum(extTestCaseMapper.moduleCount(request));
// }
//优化：将for循环内的SQL抽出来，只差一次 //优化：将for循环内的SQL抽出来，只差一次
List<String> allModuleIdList = new ArrayList<>(); List<String> allModuleIdList = new ArrayList<>();
for (TestCaseNodeDTO node : testCaseNodes) { for (TestCaseNodeDTO node : testCaseNodes) {
@ -464,6 +440,7 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
testCaseNode.setCreateTime(System.currentTimeMillis()); testCaseNode.setCreateTime(System.currentTimeMillis());
testCaseNode.setUpdateTime(System.currentTimeMillis()); testCaseNode.setUpdateTime(System.currentTimeMillis());
testCaseNode.setLevel(level); testCaseNode.setLevel(level);
testCaseNode.setCreateUser(SessionUtils.getUserId());
testCaseNode.setId(UUID.randomUUID().toString()); testCaseNode.setId(UUID.randomUUID().toString());
double pos = getNextLevelPos(projectId, level, pId); double pos = getNextLevelPos(projectId, level, pId);
testCaseNode.setPos(pos); testCaseNode.setPos(pos);