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

refactor(测试计划): 脑图保存同名校验

This commit is contained in:
guoyuqi 2024-06-18 10:31:23 +08:00 committed by Craftsman
parent 4bc046cf80
commit 6d5923f8a6
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanCollectionMinderService.java
View File

@ -258,7 +258,6 @@ public class TestPlanCollectionMinderService {
private void dealEditList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap) { private void dealEditList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap) {
if (CollectionUtils.isNotEmpty(request.getEditList())) { if (CollectionUtils.isNotEmpty(request.getEditList())) {
Map<String, List<TestPlanCollection>> parentMap = getParentMap(request); Map<String, List<TestPlanCollection>> parentMap = getParentMap(request);
Map<String, List<TestPlanCollection>> childrenMap = getChildrenMap(request);
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
TestPlanCollectionMapper collectionMapper = sqlSession.getMapper(TestPlanCollectionMapper.class); TestPlanCollectionMapper collectionMapper = sqlSession.getMapper(TestPlanCollectionMapper.class);
//新增 //新增
@ -266,33 +265,19 @@ public class TestPlanCollectionMinderService {
//更新 //更新
Map<String, List<String>> updateTypeNameMap = dealUpdateList(request, userId, associateMap, parentMap, collectionMapper); Map<String, List<String>> updateTypeNameMap = dealUpdateList(request, userId, associateMap, parentMap, collectionMapper);
//检查同一类型名称重复 //检查同一类型名称重复
checkNameRepeat(updateTypeNameMap, addTypeNameMap, childrenMap); checkNameRepeat(updateTypeNameMap, addTypeNameMap);
sqlSession.flushStatements(); sqlSession.flushStatements();
SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory); SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
} }
} }
private static void checkNameRepeat(Map<String, List<String>> updateTypeNameMap, Map<String, List<String>> addTypeNameMap, Map<String, List<TestPlanCollection>> childrenMap) { private static void checkNameRepeat(Map<String, List<String>> updateTypeNameMap, Map<String, List<String>> addTypeNameMap) {
updateTypeNameMap.forEach((k, v)->{ updateTypeNameMap.forEach((k, v)->{
List<String> nameList = addTypeNameMap.get(k); List<String> nameList = addTypeNameMap.get(k);
if (CollectionUtils.isNotEmpty(nameList)) { if (CollectionUtils.isNotEmpty(nameList)) {
List<String> repeatList = v.stream().filter(nameList::contains).collect(Collectors.toList()); List<String> repeatList = v.stream().filter(nameList::contains).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(repeatList)) { if (CollectionUtils.isNotEmpty(repeatList)) {
throw new MSException(Translator.get("test_plan.mind.collection_name_repeat")); throw new MSException(Translator.get("test_plan.mind.collection_name_repeat"));
} else {
nameList.addAll(v);
addTypeNameMap.put(k, nameList);
}
} else {
addTypeNameMap.put(k,v);
}
});
childrenMap.forEach((k, v)->{
List<String> nameList = addTypeNameMap.get(k);
if (CollectionUtils.isNotEmpty(nameList)) {
List<TestPlanCollection> list = v.stream().filter(t -> nameList.contains(t.getName())).toList();
if (CollectionUtils.isNotEmpty(list)) {
throw new MSException(Translator.get("test_plan.mind.collection_name_repeat"));
} }
} }
}); });
@ -307,7 +292,7 @@ public class TestPlanCollectionMinderService {
//处理更新 //处理更新
for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : updateList) { for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : updateList) {
TestPlanCollection testPlanCollection = updateCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper); TestPlanCollection testPlanCollection = updateCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper);
checkChangeDataReapet(typeNamesMap, testPlanCollection); checkChangeDataRepeat(typeNamesMap, testPlanCollection);
setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection); setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection);
} }
} }
@ -331,14 +316,14 @@ public class TestPlanCollectionMinderService {
if (CollectionUtils.isNotEmpty(addList)) { if (CollectionUtils.isNotEmpty(addList)) {
for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : addList) { for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : addList) {
TestPlanCollection testPlanCollection = addCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper); TestPlanCollection testPlanCollection = addCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper);
checkChangeDataReapet(typeNamesMap, testPlanCollection); checkChangeDataRepeat(typeNamesMap, testPlanCollection);
setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection); setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection);
} }
} }
return typeNamesMap; return typeNamesMap;
} }
private static void checkChangeDataReapet(Map<String, List<String>> typeNamesMap, TestPlanCollection testPlanCollection) { private static void checkChangeDataRepeat(Map<String, List<String>> typeNamesMap, TestPlanCollection testPlanCollection) {
List<String> nameList = typeNamesMap.get(testPlanCollection.getType()); List<String> nameList = typeNamesMap.get(testPlanCollection.getType());
if (CollectionUtils.isNotEmpty(nameList)) { if (CollectionUtils.isNotEmpty(nameList)) {
if (nameList.contains(testPlanCollection.getName())) { if (nameList.contains(testPlanCollection.getName())) {