From 86581e45804cb8e7c941d23f98e0173a2b6be0f9 Mon Sep 17 00:00:00 2001 From: AgAngle <1323481023@qq.com> Date: Wed, 28 Aug 2024 17:10:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E7=B1=BB=E5=90=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/{CustomFieldDao.java => CustomFieldDTO.java} | 2 +- .../resolver/field/AbstractCustomFieldResolver.java | 8 ++++---- .../resolver/field/CustomFieldDateResolver.java | 4 ++-- .../resolver/field/CustomFieldDateTimeResolver.java | 4 ++-- .../resolver/field/CustomFieldFloatResolver.java | 4 ++-- .../resolver/field/CustomFieldIntegerResolver.java | 4 ++-- .../resolver/field/CustomFieldMemberResolver.java | 4 ++-- .../field/CustomFieldMultipleMemberResolver.java | 4 ++-- .../field/CustomFieldMultipleSelectResolver.java | 4 ++-- .../field/CustomFieldMultipleTextResolver.java | 4 ++-- .../resolver/field/CustomFieldSelectResolver.java | 4 ++-- .../resolver/field/CustomFieldTextResolver.java | 4 ++-- .../service/BaseTemplateCustomFieldService.java | 8 ++++---- .../system/base/BaseCustomFieldTestService.java | 12 ++++++------ 14 files changed, 35 insertions(+), 35 deletions(-) rename backend/services/system-setting/src/main/java/io/metersphere/system/dto/{CustomFieldDao.java => CustomFieldDTO.java} (82%) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/CustomFieldDao.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/CustomFieldDTO.java similarity index 82% rename from backend/services/system-setting/src/main/java/io/metersphere/system/dto/CustomFieldDao.java rename to backend/services/system-setting/src/main/java/io/metersphere/system/dto/CustomFieldDTO.java index 1a2652646c..61f989f299 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/CustomFieldDao.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/CustomFieldDTO.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class CustomFieldDao extends CustomField implements Serializable { +public class CustomFieldDTO extends CustomField implements Serializable { private static final long serialVersionUID = 1L; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/AbstractCustomFieldResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/AbstractCustomFieldResolver.java index e0e16d3438..dc51c39c6d 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/AbstractCustomFieldResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/AbstractCustomFieldResolver.java @@ -4,7 +4,7 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.exception.MSException; import io.metersphere.sdk.util.JSON; import io.metersphere.sdk.util.Translator; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -20,13 +20,13 @@ public abstract class AbstractCustomFieldResolver { * @param customField * @param value */ - abstract public void validate(CustomFieldDao customField, Object value); + abstract public void validate(CustomFieldDTO customField, Object value); protected void throwValidateException(String name) { throw new MSException(FIELD_VALIDATE_ERROR, Translator.getWithArgs(FIELD_VALIDATE_ERROR.getMessage(), name)); } - protected void validateRequired(CustomFieldDao customField, Object value) { + protected void validateRequired(CustomFieldDTO customField, Object value) { if (!customField.getRequired()) { return; } @@ -37,7 +37,7 @@ public abstract class AbstractCustomFieldResolver { } } - protected void validateArrayRequired(CustomFieldDao customField, Object value) { + protected void validateArrayRequired(CustomFieldDTO customField, Object value) { if (!customField.getRequired()) { return; } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateResolver.java index 7d86454c95..251ef88226 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateResolver.java @@ -2,13 +2,13 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.util.DateUtils; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import org.apache.commons.lang3.StringUtils; public class CustomFieldDateResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); validateString(customField.getName(), value); try { diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateTimeResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateTimeResolver.java index 44d52a5288..45ad557bd1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateTimeResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldDateTimeResolver.java @@ -2,13 +2,13 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.util.DateUtils; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import org.apache.commons.lang3.StringUtils; public class CustomFieldDateTimeResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); try { if (value != null && StringUtils.isNotBlank(value.toString())) { diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldFloatResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldFloatResolver.java index 6bf5b1acde..34cb997d1f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldFloatResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldFloatResolver.java @@ -1,12 +1,12 @@ package io.metersphere.system.resolver.field; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; public class CustomFieldFloatResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); if (value != null && !(value instanceof Number)) { throwValidateException(customField.getName()); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldIntegerResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldIntegerResolver.java index e59b7bfc07..b683d1461f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldIntegerResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldIntegerResolver.java @@ -1,10 +1,10 @@ package io.metersphere.system.resolver.field; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; public class CustomFieldIntegerResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); if (value != null && !(value instanceof Integer)) { throwValidateException(customField.getName()); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMemberResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMemberResolver.java index e2792baa05..d3be76c8a5 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMemberResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMemberResolver.java @@ -1,12 +1,12 @@ package io.metersphere.system.resolver.field; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; public class CustomFieldMemberResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); validateString(customField.getName(), value); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleMemberResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleMemberResolver.java index 9cc2d5eee8..d54b2454a7 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleMemberResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleMemberResolver.java @@ -2,12 +2,12 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.util.JSON; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; public class CustomFieldMultipleMemberResolver extends CustomFieldMemberResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateArrayRequired(customField, value); validateArray(customField.getName(), value); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleSelectResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleSelectResolver.java index 31571b26af..7987b840c5 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleSelectResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleSelectResolver.java @@ -3,7 +3,7 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.util.JSON; import io.metersphere.system.domain.CustomFieldOption; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import java.util.List; import java.util.Set; @@ -12,7 +12,7 @@ import java.util.stream.Collectors; public class CustomFieldMultipleSelectResolver extends CustomFieldSelectResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateArrayRequired(customField, value); validateArray(customField.getName(), value); List options = getOptions(customField.getId()); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleTextResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleTextResolver.java index 202cd8bd8a..27d2f2e5f3 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleTextResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldMultipleTextResolver.java @@ -2,13 +2,13 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.util.JSON; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; public class CustomFieldMultipleTextResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateArrayRequired(customField, value); validateArray(customField.getName(), value); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldSelectResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldSelectResolver.java index e42763533f..f9fcecd79c 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldSelectResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldSelectResolver.java @@ -3,7 +3,7 @@ package io.metersphere.system.resolver.field; import io.metersphere.sdk.util.CommonBeanFactory; import io.metersphere.system.domain.CustomFieldOption; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import io.metersphere.system.service.BaseCustomFieldOptionService; import org.apache.commons.lang3.StringUtils; @@ -14,7 +14,7 @@ import java.util.stream.Collectors; public class CustomFieldSelectResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); if (value == null) { return; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldTextResolver.java b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldTextResolver.java index a45a155843..9b84a29ecf 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldTextResolver.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/resolver/field/CustomFieldTextResolver.java @@ -1,11 +1,11 @@ package io.metersphere.system.resolver.field; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; public class CustomFieldTextResolver extends AbstractCustomFieldResolver { @Override - public void validate(CustomFieldDao customField, Object value) { + public void validate(CustomFieldDTO customField, Object value) { validateRequired(customField, value); validateString(customField.getName(), value); } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateCustomFieldService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateCustomFieldService.java index a9dfe09d3a..3365162518 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateCustomFieldService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateCustomFieldService.java @@ -4,7 +4,7 @@ import io.metersphere.sdk.util.BeanUtils; import io.metersphere.system.domain.CustomField; import io.metersphere.system.domain.TemplateCustomField; import io.metersphere.system.domain.TemplateCustomFieldExample; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import io.metersphere.system.dto.sdk.request.TemplateCustomFieldRequest; import io.metersphere.system.mapper.TemplateCustomFieldMapper; import io.metersphere.system.resolver.field.AbstractCustomFieldResolver; @@ -106,11 +106,11 @@ public class BaseTemplateCustomFieldService { private String parseDefaultValue(TemplateCustomFieldRequest field) { CustomField customField = baseCustomFieldService.getWithCheck(field.getFieldId()); AbstractCustomFieldResolver customFieldResolver = CustomFieldResolverFactory.getResolver(customField.getType()); - CustomFieldDao customFieldDao = BeanUtils.copyBean(new CustomFieldDao(), customField); - customFieldDao.setRequired(false); + CustomFieldDTO customFieldDTO = BeanUtils.copyBean(new CustomFieldDTO(), customField); + customFieldDTO.setRequired(false); if (BooleanUtils.isNotFalse(validateDefaultValue.get())) { // 创建项目时不校验默认值 - customFieldResolver.validate(customFieldDao, field.getDefaultValue()); + customFieldResolver.validate(customFieldDTO, field.getDefaultValue()); } return customFieldResolver.parse2String(field.getDefaultValue()); } diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/base/BaseCustomFieldTestService.java b/backend/services/system-setting/src/test/java/io/metersphere/system/base/BaseCustomFieldTestService.java index f42ccc9547..2bb1c39ab4 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/base/BaseCustomFieldTestService.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/base/BaseCustomFieldTestService.java @@ -6,7 +6,7 @@ import io.metersphere.sdk.constants.TemplateScene; import io.metersphere.sdk.exception.MSException; import io.metersphere.sdk.util.BeanUtils; import io.metersphere.system.domain.CustomField; -import io.metersphere.system.dto.CustomFieldDao; +import io.metersphere.system.dto.CustomFieldDTO; import io.metersphere.system.dto.sdk.request.CustomFieldOptionRequest; import io.metersphere.system.resolver.field.AbstractCustomFieldResolver; import io.metersphere.system.resolver.field.CustomFieldResolverFactory; @@ -129,8 +129,8 @@ public class BaseCustomFieldTestService { AbstractCustomFieldResolver customFieldResolver = CustomFieldResolverFactory.getResolver(customFieldType.name()); CustomField customField = getCustomFields().get(customFieldType); - CustomFieldDao customFieldDao = BeanUtils.copyBean(new CustomFieldDao(), customField); - customFieldDao.setRequired(true); + CustomFieldDTO customFieldDTO = BeanUtils.copyBean(new CustomFieldDTO(), customField); + customFieldDTO.setRequired(true); String valueStr = customFieldResolver.parse2String(objectValueMap.get(customFieldType)); Object objectValue = customFieldResolver.parse2Value(valueStr); // 校验 parse2String 和 parse2Value 是否正确 @@ -157,8 +157,8 @@ public class BaseCustomFieldTestService { private void invokeValidate(Map valueMap, CustomFieldType customFieldType) { AbstractCustomFieldResolver customFieldResolver = CustomFieldResolverFactory.getResolver(customFieldType.name()); CustomField customField = getCustomFields().get(customFieldType); - CustomFieldDao customFieldDao = BeanUtils.copyBean(new CustomFieldDao(), customField); - customFieldDao.setRequired(true); - customFieldResolver.validate(customFieldDao, valueMap.get(customFieldType)); + CustomFieldDTO customFieldDTO = BeanUtils.copyBean(new CustomFieldDTO(), customField); + customFieldDTO.setRequired(true); + customFieldResolver.validate(customFieldDTO, valueMap.get(customFieldType)); } }