ソースを参照

1.修改导入激活码异常场景错误分类

yuanliang 1 年間 前
コミット
e686ed18f2

+ 10 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -416,7 +416,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         List<StudentVo> studentVos = studentDao.selectPage(PageUtil.getPage(studentSearch), studentSearch);
         Map<String, StudentVo> mapStudentByPhone = studentVos.stream().collect(Collectors.toMap(StudentVo::getPhone, Function.identity()));
 
-        Map<Integer,List<String>> errMsgMap = new LinkedHashMap<>();
+//        Map<Integer,List<String>> errMsgMap = new LinkedHashMap<>();
         Map<String, Integer> codeRowMap = new HashMap<>();
 
 
@@ -439,7 +439,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 continue;
             }
             int msgRowNo = rowIndex;
-            List<String> errList = errMsgMap.getOrDefault(msgRowNo, new ArrayList<>());
+//            List<String> errList = errMsgMap.getOrDefault(msgRowNo, new ArrayList<>());
             String code = template.getCode();
             if (codeRowMap.containsKey(code)) {
                 List<Integer> lines = code_repeat_lines.getOrDefault(code, new ArrayList<>());
@@ -468,7 +468,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 }
             }
 
-            errMsgMap.put(msgRowNo, errList);
+//            errMsgMap.put(msgRowNo, errList);
         }
 
 
@@ -507,13 +507,13 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         }
 
 
-        List<String> errMsg = errMsgMap.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
-        if (!errMsg.isEmpty()) {
-            String errLines = errMsgMap.entrySet().stream().filter(next -> CollectionUtils.isNotEmpty(next.getValue()))
-                    .map(next -> String.valueOf(next.getKey())).collect(Collectors.joining("、"));
-            errMsg.add(0, "第" + errLines + "行存在错误");
-            throw new BizException(String.join(",", errMsg));
-        }
+//        List<String> errMsg = errMsgMap.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+//        if (!errMsg.isEmpty()) {
+//            String errLines = errMsgMap.entrySet().stream().filter(next -> CollectionUtils.isNotEmpty(next.getValue()))
+//                    .map(next -> String.valueOf(next.getKey())).collect(Collectors.joining("、"));
+//            errMsg.add(0, "第" + errLines + "行存在错误");
+//            throw new BizException(String.join(",", errMsg));
+//        }
         List<TenantActivationCode> tenantActivationCodes = importTemplates.stream()
                 .filter(next -> StringUtils.isNotEmpty(next.getCode()) && StringUtils.isNotBlank(next.getPhone()))
                 .map(next -> {