添加重复数据判断

@@ -14,15 +14,18 @@ import com.ash.base.SpringJobBeanFactory;
 import com.ash.base.excelOpt.ExcelCheck;
 import com.ash.base.excelOpt.ExcelErrorMessage;
 import com.ash.base.excelOpt.ValidateAnnotation;
+import com.ash.entity.Case;
 import com.ash.entity.dao.CaseMapper;
 import com.ash.excelData.CaseExcelData;
 import com.ash.service.CaseService;
+import com.ash.util.ObjectValueOption;
 import com.sun.javafx.binding.StringFormatter;
 import javafx.beans.binding.StringExpression;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
@@ -151,6 +154,7 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+        checkRepeat();
         if (CollectionUtils.isNotEmpty(errorList)) {
             throw new ExcelAnalysisException("数据校验错误!");
         }
@@ -281,12 +285,16 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
     public void checkRepeat() {
         Map<Field, ValidateAnnotation> repeatFieldMap = fieldMap.entrySet().stream().filter(entry -> !entry.getValue().getExcelCheck().canRepeat())
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        CaseService caseService = SpringJobBeanFactory.getBean(CaseService.class);
         repeatFieldMap.forEach((field, annotation) -> {
             //使用iterate方式构建流以获取行号
+            List<String> uniqueCodeList = new ArrayList<>();
             Stream.iterate(0, i -> i + 1).limit(list.size()).collect(Collectors.groupingBy(i -> {
                         try {
                             Object value = field.get(list.get(i));
-                            return JSON.toJSONString(value);
+                            String uc = ObjectValueOption.getObjString(value);
+                            uniqueCodeList.add(uc);
+                            return uc;
                         } catch (IllegalAccessException e) {
                             throw new RuntimeException(e);
                         }
@@ -301,6 +309,21 @@ public class CaseExcelListener extends AnalysisEventListener<CaseExcelData>
                             }
                         }
                     });
+            if (CollectionUtils.isEmpty(errorList)) {
+                List<String> repeatDataList = caseService.listByFeild(field.getName(), uniqueCodeList);
+                for (int i = 0; i < list.size(); i++) {
+                    try {
+                        Object value = field.get(list.get(i));
+                        String uc = ObjectValueOption.getObjString(value);
+                        if (repeatDataList.contains(uc)) {
+                            addError(i + 1, annotation.getHeadName() + "字段已存在!");
+                        }
+
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
         });
     }
 

@@ -17,6 +17,7 @@ import com.ash.base.excelOpt.ValidateAnnotation;
 import com.ash.entity.dao.WarningInstanceMapper;
 import com.ash.excelData.WarningInstanceExcelData;
 import com.ash.service.WarningInstanceService;
+import com.ash.util.ObjectValueOption;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -150,6 +151,7 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+        checkRepeat();
         if (CollectionUtils.isNotEmpty(errorList)) {
             throw new ExcelAnalysisException("数据校验错误!");
         }
@@ -285,12 +287,16 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
     public void checkRepeat() {
         Map<Field, ValidateAnnotation> repeatFieldMap = fieldMap.entrySet().stream().filter(entry -> !entry.getValue().getExcelCheck().canRepeat())
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        WarningInstanceService warningInstanceService = SpringJobBeanFactory.getBean(WarningInstanceService.class);
         repeatFieldMap.forEach((field, annotation) -> {
             //使用iterate方式构建流以获取行号
+            List<String> uniqueCodeList = new ArrayList<>();
             Stream.iterate(0, i -> i + 1).limit(list.size()).collect(Collectors.groupingBy(i -> {
                         try {
                             Object value = field.get(list.get(i));
-                            return JSON.toJSONString(value);
+                            String uc = ObjectValueOption.getObjString(value);
+                            uniqueCodeList.add(uc);
+                            return uc;
                         } catch (IllegalAccessException e) {
                             throw new RuntimeException(e);
                         }
@@ -305,6 +311,21 @@ public class WarningInstanceExcelListener extends AnalysisEventListener<WarningI
                             }
                         }
                     });
+            if (CollectionUtils.isEmpty(errorList)) {
+                List<String> repeatDataList = warningInstanceService.listByFeild(field.getName(), uniqueCodeList);
+                for (int i = 0; i < list.size(); i++) {
+                    try {
+                        Object value = field.get(list.get(i));
+                        String uc = ObjectValueOption.getObjString(value);
+                        if (repeatDataList.contains(uc)) {
+                            addError(i + 1, annotation.getHeadName() + "字段已存在!");
+                        }
+
+                    } catch (IllegalAccessException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
         });
     }
 

@@ -16,6 +16,7 @@ import com.ash.listener.CaseExcelListener;
 import com.ash.util.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.query.MPJQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -149,6 +152,23 @@ public class CaseService {
     }
 
 
+    public List<String> listByFeild(String fieldName, List<String> values) {
+        QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in(fieldName,values);
+        List<Case> cases = caseMapper.selectList(queryWrapper);
+        return Optional.ofNullable(cases).map(all -> all.stream().map(item -> {
+            try {
+                Field field = Case.class.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                return String.valueOf(field.get(item));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return "";
+        }).filter(StringUtils::isNotBlank).collect(Collectors.toList())).orElse(new ArrayList<>());
+    }
+
+
     public List<String> listUnReview(List<String> exceptIds, String area) {
         QueryWrapper<Case> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<Case> lambda = queryWrapper.lambda();

@@ -30,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -132,6 +133,22 @@ public class WarningInstanceService {
         return warningInstanceMapper.selectList(queryWrapper);
     }
 
+    public List<String> listByFeild(String fieldName, List<String> values) {
+        QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in(fieldName,values);
+        List<WarningInstance> cases = warningInstanceMapper.selectList(queryWrapper);
+        return Optional.ofNullable(cases).map(all -> all.stream().map(item -> {
+            try {
+                Field field = WarningInstance.class.getDeclaredField(fieldName);
+                field.setAccessible(true);
+                return String.valueOf(field.get(item));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return "";
+        }).filter(StringUtils::isNotBlank).collect(Collectors.toList())).orElse(new ArrayList<>());
+    }
+
     public List<String> listUnReview(List<String> exceptIds, String area) {
         QueryWrapper<WarningInstance> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<WarningInstance> lambda = queryWrapper.lambda();