diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java index 86c6e93c8d72d86bd693a1d8ab4b4f5f12f32288..bbbe5713bfd96b09797bfc81e008fd35be5b2e19 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/ValidationMessageBuilder.java @@ -18,7 +18,6 @@ import java.util.StringJoiner; public class ValidationMessageBuilder { public static String buildBindingErrorMsg(BindingResult bindingResult) { - String prefix = "参数验证失败: "; StringJoiner joiner = new StringJoiner(", "); for (ObjectError error : bindingResult.getAllErrors()) { String errorMessage = Optional.ofNullable(error.getDefaultMessage()).orElse("验证失败"); @@ -30,17 +29,16 @@ public class ValidationMessageBuilder { } joiner.add(source + " " + errorMessage); } - return prefix + joiner; + return joiner.toString(); } - public static String buildConstraintViolationErrorMsg(Set> constraintViolations) { - String prefix = "参数验证失败: "; + public static String buildConstraintViolationErrorMsg(Set> constraintViolations) { StringJoiner joiner = new StringJoiner(", "); for (ConstraintViolation violation : constraintViolations) { String propertyPath = violation.getPropertyPath().toString(); joiner.add(getActualProperty(propertyPath) + " " + violation.getMessage()); } - return prefix + joiner; + return joiner.toString(); } private static String getActualProperty(String propertyPath) { diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelBeanReadListener.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelBeanReadListener.java index ba6945dab7be68414fd977319663e08beacce736..a448385d341a595f9edb5e650d88eb055e3aa6a0 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelBeanReadListener.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/support/excel/listener/ExcelBeanReadListener.java @@ -7,7 +7,8 @@ import org.apache.commons.collections4.CollectionUtils; import javax.validation.ConstraintViolation; import java.util.Set; -import java.util.stream.Collectors; + +import static com.schbrain.common.util.support.ValidationMessageBuilder.buildConstraintViolationErrorMsg; /** * @author liaozan @@ -27,11 +28,10 @@ public class ExcelBeanReadListener extends ExcelReadListenerBase { } protected void collectErrorMsg(AnalysisContext context, Set> violations) { - String errorMsg = violations.stream().map(ConstraintViolation::getMessage).collect(Collectors.joining(",")); ReadSheetHolder currentSheet = context.readSheetHolder(); String sheetName = currentSheet.getSheetName(); Integer rowIndex = currentSheet.getRowIndex(); - getErrors().put(sheetName, rowIndex + 1, errorMsg); + getErrors().put(sheetName, rowIndex + 1, buildConstraintViolationErrorMsg(violations)); } -} \ No newline at end of file +}