Merge branch 'import_250116' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/analysis/StudentImportAnalysis.java

@@ -5,7 +5,6 @@ import com.alibaba.excel.enums.CellExtraTypeEnum;
 import com.alibaba.excel.metadata.Sheet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.microsvc.toolkit.middleware.excel.analysis.AnalysisContext;
 import com.microsvc.toolkit.middleware.excel.analysis.DataAnalysis;
 import com.microsvc.toolkit.middleware.excel.util.DownloadManager;
@@ -199,12 +198,8 @@ public class StudentImportAnalysis extends DataAnalysis<StudentImportAnalysis> {
      * 加载校验数据参数
      */
     private void loadVerifyParamData() {
-        List<StudentImportWrapper.StudentImport> studentImportWrappers = getStudentImportWrappers();
-        if (CollectionUtils.isEmpty(studentImportWrappers)) {
-            throw new BizException("导入数据为空");
-        }
         //获取所有的手机号和身份证号
-        List<String> phones = studentImportWrappers.stream()
+        List<String> phones = getStudentImportWrappers().stream()
                 .map(StudentImportWrapper.StudentImport::getPhone)
                 .filter(StringUtils::isNotBlank)
                 .distinct()

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/analysis/TeacherImportAnalysis.java

@@ -5,11 +5,9 @@ import com.alibaba.excel.enums.CellExtraTypeEnum;
 import com.alibaba.excel.metadata.Sheet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.microsvc.toolkit.middleware.excel.analysis.AnalysisContext;
 import com.microsvc.toolkit.middleware.excel.analysis.DataAnalysis;
 import com.microsvc.toolkit.middleware.excel.util.DownloadManager;
-import com.yonge.cooleshow.biz.dal.execl.entity.StudentImportWrapper;
 import com.yonge.cooleshow.biz.dal.execl.entity.TeacherImportWrapper;
 import com.yonge.cooleshow.biz.dal.execl.listener.TeacherImportListener;
 import com.yonge.cooleshow.biz.dal.service.EasyExcelService;
@@ -207,12 +205,8 @@ public class TeacherImportAnalysis extends DataAnalysis<TeacherImportAnalysis> {
      * 加载校验数据参数
      */
     private void loadVerifyParamData() {
-        List<TeacherImportWrapper.TeacherImport> importWrappers = getTeacherImportWrappers();
-        if (CollectionUtils.isEmpty(importWrappers)) {
-            throw new BizException("导入数据为空");
-        }
         //获取所有的手机号和身份证号
-        List<String> phones = importWrappers.stream()
+        List<String> phones = getTeacherImportWrappers().stream()
                 .map(TeacherImportWrapper.TeacherImport::getPhone)
                 .filter(StringUtils::isNotBlank)
                 .distinct()

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ExcelAnalyseCoreServiceImpl.java

@@ -179,7 +179,9 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
         AnalysisContext context = analysis.getContext();
         // 生成导入数据记录
         createFileImportRecord(wrapper, context);
-
+        if(context.getTotal() == 0){
+            throw new BizException("导入数据为空");
+        }
         // 入库业务数据
         if (context.getFailure() > 0) {
             log.info("readExaminationExcelData collect.size={}", analysis.getTeacherImportWrappers().size());
@@ -197,6 +199,9 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
         // 生成导入数据记录
         createFileImportRecord(wrapper, context);
 
+        if(context.getTotal() == 0){
+            throw new BizException("导入数据为空");
+        }
         // 入库业务数据
         if (context.getFailure() > 0) {
             log.info("readStudentExcelData collect.size={}", analysis.getStudentImportWrappers().size());