From 328a72063af5accdf6e36a138e96c6c4742dad0c Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Tue, 15 Aug 2023 20:06:05 +0800
Subject: [PATCH] Polish

---
 .../common/util/support/ValidationMessageBuilder.java     | 8 +++-----
 .../support/excel/listener/ExcelBeanReadListener.java     | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

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 86c6e93..bbbe571 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<ConstraintViolation<?>> constraintViolations) {
-        String prefix = "参数验证失败: ";
+    public static <T> String buildConstraintViolationErrorMsg(Set<ConstraintViolation<T>> 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 ba6945d..a448385 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<T> extends ExcelReadListenerBase<T> {
     }
 
     protected void collectErrorMsg(AnalysisContext context, Set<ConstraintViolation<T>> 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
+}
-- 
GitLab