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

refactor(测试用例): 导出用例等级为系统字段，导出xmind格式新模板

This commit is contained in:
WangXu10 2024-08-15 16:54:52 +08:00 committed by 刘瑞斌
parent 96190735b2
commit bb5cc4bce5
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/services/case-management/src/main/java/io/metersphere/functional/excel/domain/FunctionalCaseExportColumns.java
View File

@ -3,6 +3,7 @@ package io.metersphere.functional.excel.domain;
import io.metersphere.sdk.util.Translator;
import io.metersphere.system.dto.sdk.TemplateCustomFieldDTO;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.util.LinkedHashMap;
import java.util.List;
@ -37,6 +38,12 @@ public class FunctionalCaseExportColumns {
}
public void initCustomColumns(List<TemplateCustomFieldDTO> headerCustomFields) {
headerCustomFields.forEach(item -> customColumns.put(item.getFieldId(), item.getFieldName()));
headerCustomFields.forEach(item -> {
if (!StringUtils.equalsIgnoreCase(item.getFieldName(), Translator.get("custom_field.functional_priority"))) {
customColumns.put(item.getFieldId(), item.getFieldName());
} else {
systemColumns.put(item.getFieldId(), item.getFieldName());
}
});
}
}

27
backend/services/case-management/src/main/java/io/metersphere/functional/xmind/utils/XmindExportUtil.java
View File

@ -134,10 +134,8 @@ public class XmindExportUtil {
private static void buildTemplateTopic(ITopic topic, IStyle style, FunctionalCaseXmindDTO dto, ITopic itemTopic, IWorkbook workbook, Map<String, List<String>> customFieldOptionsMap) {
//用例名称
TemplateCustomFieldDTO priorityDto = dto.getTemplateCustomFieldDTOList().stream().filter(item -> StringUtils.equalsIgnoreCase(item.getFieldName(), Translator.get("custom_field.functional_priority"))).findFirst().get();
String priority = Translator.get("custom_field.functional_priority").concat("：").concat(Translator.get("required")).concat(", ").concat(Translator.get("options")).concat(JSON.toJSONString(customFieldOptionsMap.get(priorityDto.getFieldName())));
String name = Translator.get("case.export.system.columns.name").concat(", ").concat(Translator.get("required"));
itemTopic.setTitleText("case-P0：".concat(dto.getName()).concat(" ").concat(priority).concat(name));
itemTopic.setTitleText("case：".concat(dto.getName()).concat(name));
//前置条件
if (StringUtils.isNotBlank(dto.getPrerequisite())) {
@ -238,15 +236,18 @@ public class XmindExportUtil {
//自定义字段
dto.getTemplateCustomFieldDTOList().forEach(item -> {
if (!StringUtils.equalsIgnoreCase(item.getFieldName(), Translator.get("custom_field.functional_priority"))) {
ITopic customTopic = workbook.createTopic();
if (!StringUtils.equalsIgnoreCase(item.getFieldName(), Translator.get("custom_field.functional_priority"))) {
String fieldComment = getComment(item, customFieldOptionsMap);
customTopic.setTitleText(item.getFieldName().concat("：").concat(fieldComment));
} else {
String priority = Translator.get("custom_field.functional_priority").concat("：").concat(Translator.get("required")).concat(", ").concat(Translator.get("options")).concat(JSON.toJSONString(customFieldOptionsMap.get(item.getFieldName())));
customTopic.setTitleText(priority);
}
if (style != null) {
customTopic.setStyleId(style.getId());
}
itemTopic.add(customTopic, ITopic.ATTACHED);
}
});
topic.add(itemTopic);
@ -421,11 +422,10 @@ public class XmindExportUtil {
FunctionalCaseExportColumns columns = new FunctionalCaseExportColumns();
Map<String, String> customFieldMap = dto.getCustomFieldDTOList().stream().collect(Collectors.toMap(FunctionalCaseCustomField::getFieldId, FunctionalCaseCustomField::getValue));
Map<String, TemplateCustomFieldDTO> temCustomFieldsMap = templateCustomFields.stream().collect(Collectors.toMap(TemplateCustomFieldDTO::getFieldId, i -> i));
//用例名称
TemplateCustomFieldDTO priority = templateCustomFields.stream().filter(item -> StringUtils.equalsIgnoreCase(item.getFieldName(), Translator.get("custom_field.functional_priority"))).findFirst().get();
String casePriority = customFieldMap.get(priority.getFieldId());
itemTopic.setTitleText("case-".concat(StringUtils.defaultIfBlank(casePriority, StringUtils.EMPTY)).concat("：").concat(dto.getName()));
itemTopic.setTitleText("case：".concat(dto.getName()));
//系统字段
systemColumns.forEach(item -> {
if (columns.getSystemColumns().containsKey(item) && !StringUtils.equalsIgnoreCase(item, "name")
@ -452,6 +452,16 @@ public class XmindExportUtil {
}
itemTopic.add(preTopic, ITopic.ATTACHED);
}
if (temCustomFieldsMap.containsKey(item)) {
if (!StringUtils.equalsIgnoreCase(Translator.get(temCustomFieldsMap.get(item).getFieldName()), Translator.get("custom_field.functional_priority"))) {
ITopic preTopic = workbook.createTopic();
preTopic.setTitleText(Translator.get("custom_field.functional_priority").concat("：").concat(customFieldMap.get(item)));
if (style != null) {
preTopic.setStyleId(style.getId());
}
itemTopic.add(preTopic, ITopic.ATTACHED);
}
}
});
if (StringUtils.equalsIgnoreCase(dto.getCaseEditType(), FunctionalCaseTypeConstants.CaseEditType.TEXT.name())) {
@ -521,7 +531,6 @@ public class XmindExportUtil {
//自定义字段
Map<String, String> customColumnsMap = request.getCustomFields().stream().collect(Collectors.toMap(FunctionalCaseHeader::getId, FunctionalCaseHeader::getName));
Map<String, TemplateCustomFieldDTO> temCustomFieldsMap = templateCustomFields.stream().collect(Collectors.toMap(TemplateCustomFieldDTO::getFieldId, i -> i));
HashMap<String, AbstractCustomFieldValidator> customFieldValidatorMap = CustomFieldValidatorFactory.getValidatorMap(request.getProjectId());
customColumnsMap.forEach((k, v) -> {