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

fix: 接口定义导入用例id重复

This commit is contained in:
chenjianxing 2021-07-16 11:48:26 +08:00 committed by jianxing
parent bc12d5573d
commit 1260687c9f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -497,7 +497,14 @@ public class ApiDefinitionService {
SaveApiTestCaseRequest checkRequest = new SaveApiTestCaseRequest(); SaveApiTestCaseRequest checkRequest = new SaveApiTestCaseRequest();
if (CollectionUtils.isNotEmpty(cases)) { if (CollectionUtils.isNotEmpty(cases)) {
int batchCount = 0; int batchCount = 0;
cases.forEach(item -> { int nextNum = 0;
for (int i = 0; i < cases.size(); i++) {
ApiTestCaseWithBLOBs item = cases.get(i);
if (i == 0) {
nextNum = apiTestCaseService.getNextNum(item.getApiDefinitionId());
} else {
nextNum ++;
}
checkRequest.setName(item.getName()); checkRequest.setName(item.getName());
checkRequest.setApiDefinitionId(item.getApiDefinitionId()); checkRequest.setApiDefinitionId(item.getApiDefinitionId());
if (!apiTestCaseService.hasSameCase(checkRequest)) { if (!apiTestCaseService.hasSameCase(checkRequest)) {
@ -507,10 +514,10 @@ public class ApiDefinitionService {
item.setCreateUserId(SessionUtils.getUserId()); item.setCreateUserId(SessionUtils.getUserId());
item.setUpdateUserId(SessionUtils.getUserId()); item.setUpdateUserId(SessionUtils.getUserId());
item.setProjectId(SessionUtils.getCurrentProjectId()); item.setProjectId(SessionUtils.getCurrentProjectId());
item.setNum(getNextNum(item.getApiDefinitionId())); item.setNum(nextNum);
apiTestCaseMapper.insert(item); apiTestCaseMapper.insert(item);
} }
}); }
if (batchCount % 300 == 0) { if (batchCount % 300 == 0) {
sqlSession.flushStatements(); sqlSession.flushStatements();
} }

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

@ -325,7 +325,7 @@ public class ApiTestCaseService {
return test; return test;
} }
private int getNextNum(String definitionId) { public int getNextNum(String definitionId) {
ApiTestCase apiTestCase = extApiTestCaseMapper.getNextNum(definitionId); ApiTestCase apiTestCase = extApiTestCaseMapper.getNextNum(definitionId);
if (apiTestCase == null) { if (apiTestCase == null) {
int n = apiDefinitionMapper.selectByPrimaryKey(definitionId).getNum(); int n = apiDefinitionMapper.selectByPrimaryKey(definitionId).getNum();