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

refactor(系统设置): 功能用例和缺陷获取自定义字段接口，添加内置字段的key

This commit is contained in:
AgAngle 2024-06-26 15:01:22 +08:00 committed by jianxing
parent d7142366b4
commit 7a018b2402
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/project-management/src/main/java/io/metersphere/project/dto/CustomFieldOptions.java
View File

@ -27,6 +27,9 @@ public class CustomFieldOptions implements Serializable {
@Schema(description = "是否内置字段")
private Boolean internal;
@Schema(description = "内置字段的 key")
private String internalFieldKey;
@Schema(description = "自定义字段选项值")
private List<CustomFieldOption> options;
}

1
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateService.java
View File

@ -424,6 +424,7 @@ public class ProjectTemplateService extends BaseTemplateService {
CustomFieldOptions optionDTO = new CustomFieldOptions();
optionDTO.setId(customField.getId());
if (customField.getInternal()) {
optionDTO.setInternalFieldKey(customField.getName());
optionDTO.setName(baseCustomFieldService.translateInternalField(customField.getName()));
} else {
optionDTO.setName(customField.getName());

3
backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java
View File

@ -53,4 +53,7 @@ public class TemplateCustomFieldDTO {
@Schema(description = "是否平台系统字段")
private Boolean platformSystemField;
@Schema(description = "内置字段的 key")
private String internalFieldKey;
}

12
backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
View File

@ -27,6 +27,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import static io.metersphere.system.controller.handler.result.CommonResultCode.*;
@ -105,12 +106,7 @@ public class BaseTemplateService {
List<CustomField> customFields = baseCustomFieldService.getByIds(fieldIds);
Map<String, CustomField> fieldMap = customFields
.stream()
.collect(Collectors.toMap(CustomField::getId, customField -> {
if (customField.getInternal()) {
customField.setName(baseCustomFieldService.translateInternalField(customField.getName()));
}
return customField;
}));
.collect(Collectors.toMap(CustomField::getId, Function.identity()));
// 封装自定义字段信息
List<TemplateCustomFieldDTO> fieldDTOS = templateCustomFields.stream()
@ -121,6 +117,10 @@ public class BaseTemplateService {
TemplateCustomFieldDTO templateCustomFieldDTO = new TemplateCustomFieldDTO();
BeanUtils.copyBean(templateCustomFieldDTO, i);
templateCustomFieldDTO.setFieldName(customField.getName());
if (BooleanUtils.isTrue(customField.getInternal())) {
templateCustomFieldDTO.setInternalFieldKey(customField.getName());
templateCustomFieldDTO.setFieldName(baseCustomFieldService.translateInternalField(customField.getName()));
}
templateCustomFieldDTO.setType(customField.getType());
templateCustomFieldDTO.setInternal(customField.getInternal());
AbstractCustomFieldResolver customFieldResolver = CustomFieldResolverFactory.getResolver(customField.getType());