소스 검색

各种模板批量导入说明另起sheet更新

caozixuan 3 년 전
부모
커밋
cdd4e19618

+ 0 - 11
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/excel/BasicStudentImportDto.java

@@ -30,9 +30,6 @@ public class BasicStudentImportDto {
     @NotNull
     private String clazz;
 
-    @ExcelNote(value = "说明(仅提示用)")
-    private String desc;
-
     public String getStudentName() {
         return studentName;
     }
@@ -72,12 +69,4 @@ public class BasicStudentImportDto {
     public void setClazz(String clazz) {
         this.clazz = clazz;
     }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
 }

+ 4 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicStudentServiceImpl.java

@@ -12,6 +12,7 @@ import com.qmth.distributed.print.business.bean.result.BasicStudentResult;
 import com.qmth.distributed.print.business.entity.BasicStudent;
 import com.qmth.distributed.print.business.mapper.BasicStudentMapper;
 import com.qmth.distributed.print.business.service.BasicStudentService;
+import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCampus;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -104,6 +105,9 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
             List<Object> basicStudentImportDtoList = excelMap.get(i);
 
             assert basicStudentImportDtoList != null;
+            if (basicStudentImportDtoList.get(0) instanceof DescribeImportDto){
+                continue;
+            }
             List<BasicStudentImportDto> datasource = basicStudentImportDtoList.stream().map(e -> {
                 BasicStudentImportDto basicStudentImportDto = new BasicStudentImportDto();
                 BeanUtils.copyProperties(e, basicStudentImportDto);

+ 40 - 27
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -23,6 +23,7 @@ import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.util.CreatePdfUtil;
 import com.qmth.distributed.print.business.util.HtmlToPdfUtil;
 import com.qmth.teachcloud.common.annotation.ExcelDBFieldDesc;
+import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.SysUserImportDto;
 import com.qmth.teachcloud.common.bean.params.ArraysParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -561,7 +562,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         String dirName = stringJoiner.toString().replaceAll("\\\\", "/");
 
 //        ossUtil.ossUpload(dirName, in, null);
-        fileStoreUtil.ossUpload(dirName, in,DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
+        fileStoreUtil.ossUpload(dirName, in, DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
         jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
         jsonObject.put(SystemConstant.PATH, dirName);
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
@@ -816,11 +817,11 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                                 .add(SystemConstant.TEMP_FILES_DIR).add(File.separator)
                                 .add((String) jsonObject.get(SystemConstant.PATH));
 //                        sourceFiles.add(ossUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), stringJoinerPdf.toString()));
-                        sourceFiles.add(fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), stringJoinerPdf.toString(),uploadFileEnum.getFssType()));
+                        sourceFiles.add(fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), stringJoinerPdf.toString(), uploadFileEnum.getFssType()));
                     }
                     FileUtil.doZip(zipFile, sourceFiles);
 //                    ossUtil.ossUpload(dirName.toString(), zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))));
-                    fileStoreUtil.ossUpload(dirName.toString(), zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))),fileStoreUtil.getUploadEnumByPath(dirName.toString()).getFssType());
+                    fileStoreUtil.ossUpload(dirName.toString(), zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirName.toString()).getFssType());
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put(SystemConstant.PATH, dirName.toString());
                     jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
@@ -903,7 +904,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
                     String paperPath = firstPath + File.separator + "试卷" + File.separator + paperAttachment.getName() + paperAttachment.getType();
 //                    ossUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), paperPath);
-                    fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), paperPath,uploadFileEnum.getFssType());
+                    fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), paperPath, uploadFileEnum.getFssType());
                     count++;
                 }
             }
@@ -926,7 +927,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
                     String confirmPath = firstPath + File.separator + "审核样本" + File.separator + confirmAttachment.getName() + confirmAttachment.getType();
 //                    ossUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), confirmPath);
-                    fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), confirmPath,uploadFileEnum.getFssType());
+                    fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), confirmPath, uploadFileEnum.getFssType());
                     count++;
                 }
             }
@@ -959,7 +960,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 String cardPath = firstPath + File.separator + "题卡" + File.separator + cardAttachment.getName() + cardAttachment.getType();
                 UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
 //                ossUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), cardPath);
-                fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), cardPath,uploadFileEnum.getFssType());
+                fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), cardPath, uploadFileEnum.getFssType());
             } else {
                 List<ExamCardDetail> examCardDetailList = examCardDetailService.list(new QueryWrapper<ExamCardDetail>().lambda().eq(ExamCardDetail::getCardId, cardId));
                 if (examCardDetailList.size() != 1) {
@@ -979,7 +980,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         }
         ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
 //        ossUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))));
-        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))),fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
+        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put(SystemConstant.PATH, dirNameTmp);
         jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
@@ -1033,7 +1034,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             UploadFileEnum uploadFileEnum = UploadFileEnum.valueOf((String) jsonObject.get(SystemConstant.UPLOAD_TYPE));
 
 //                            ossUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), paperPath);
-                            fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), paperPath,uploadFileEnum.getFssType());
+                            fileStoreUtil.ossDownload((String) jsonObject.get(SystemConstant.PATH), paperPath, uploadFileEnum.getFssType());
                         }
                     }
                 }
@@ -1084,7 +1085,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
         ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
 //        ossUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))));
-        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))),fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
+        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put(SystemConstant.PATH, dirNameTmp);
         jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
@@ -1102,12 +1103,16 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     public Map<String, Object> executeImportBasicStudentLogic(Map<String, Object> map) throws Exception {
         InputStream inputStream = (InputStream) map.get("inputStream");
         System.out.println(inputStream);
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicStudentImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
+        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicStudentImportDto.class,DescribeImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             List<ExcelError> excelErrorTemp = new ArrayList<>();
             Map<String, String> checkMap = new HashMap<>();
             for (int i = 0; i < finalExcelList.size(); i++) {
                 LinkedMultiValueMap<Integer, Object> excelMap = finalExcelList.get(i);
                 List<Object> basicStudentImportDtoList = excelMap.get(i);
+                assert basicStudentImportDtoList != null;
+                if (basicStudentImportDtoList.get(0) instanceof DescribeImportDto){
+                    continue;
+                }
                 for (int y = 0; y < Objects.requireNonNull(basicStudentImportDtoList).size(); y++) {
                     BasicStudentImportDto basicStudentImportDto = (BasicStudentImportDto) basicStudentImportDtoList.get(y);
                     String studentName = basicStudentImportDto.getStudentName();
@@ -1145,12 +1150,16 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     public Map<String, Object> executeImportBasicCourseLogic(Map<String, Object> map) throws Exception {
 
         InputStream inputStream = (InputStream) map.get("inputStream");
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicCourseImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
+        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicCourseImportDto.class, DescribeImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             List<ExcelError> excelErrorTemp = new ArrayList<>();
             Map<String, String> checkMap = new HashMap<>();
             for (int i = 0; i < finalExcelList.size(); i++) {
                 LinkedMultiValueMap<Integer, Object> excelMap = finalExcelList.get(i);
                 List<Object> basicCourseImportDtoList = excelMap.get(i);
+                assert basicCourseImportDtoList != null;
+                if (basicCourseImportDtoList.get(0) instanceof DescribeImportDto) {
+                    continue;
+                }
                 for (int y = 0; y < Objects.requireNonNull(basicCourseImportDtoList).size(); y++) {
                     BasicCourseImportDto basicCourseImportDto = (BasicCourseImportDto) basicCourseImportDtoList.get(y);
                     String courseName = basicCourseImportDto.getCourseName();
@@ -1186,13 +1195,17 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Override
     public Map<String, Object> executeImportSysUserLogic(Map<String, Object> map) throws Exception {
         InputStream inputStream = (InputStream) map.get("inputStream");
-        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(SysUserImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
+        List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(SysUserImportDto.class, DescribeImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             List<ExcelError> excelErrorTemp = new ArrayList<>();
-            Map<String,String> checkName = new HashMap<>();
-            Map<String,String> checkCode = new HashMap<>();
+            Map<String, String> checkName = new HashMap<>();
+            Map<String, String> checkCode = new HashMap<>();
             for (int i = 0; i < finalExcelList.size(); i++) {
                 LinkedMultiValueMap<Integer, Object> excelMap = finalExcelList.get(i);
                 List<Object> sysUserImportDtoList = excelMap.get(i);
+                assert sysUserImportDtoList != null;
+                if (sysUserImportDtoList.get(0) instanceof DescribeImportDto) {
+                    continue;
+                }
                 for (int y = 0; y < Objects.requireNonNull(sysUserImportDtoList).size(); y++) {
                     SysUserImportDto sysUserImportDto = (SysUserImportDto) sysUserImportDtoList.get(y);
                     String name = sysUserImportDto.getName();
@@ -1202,26 +1215,26 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     String roleName = sysUserImportDto.getRoleName();
 
                     // 检验excel中
-                    if (checkName.containsKey(name)){
+                    if (checkName.containsKey(name)) {
                         throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【姓名】:" + name);
-                    }else {
-                        checkName.put(name,code);
+                    } else {
+                        checkName.put(name, code);
                     }
-                    if (checkCode.containsKey(code)){
+                    if (checkCode.containsKey(code)) {
                         throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【工号】:" + code);
-                    }else {
-                        checkCode.put(code,name);
+                    } else {
+                        checkCode.put(code, name);
                     }
 
                     excelErrorTemp.addAll(ExcelUtil.checkExcelField(sysUserImportDto, y, i));
-                    if (Objects.isNull(code) || code.length() > 30 || !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)){
-                        excelErrorTemp.add(new ExcelError(y + 1,"excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程编号]不符合输入规范"));
+                    if (Objects.isNull(code) || code.length() > 30 || !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
+                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程编号]不符合输入规范"));
                     }
-                    if (Objects.isNull(name) || name.length() > 30){
-                        excelErrorTemp.add(new ExcelError(y + 1,"excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程名称]不符合输入规范"));
+                    if (Objects.isNull(name) || name.length() > 30) {
+                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程名称]不符合输入规范"));
                     }
-                    if (Objects.isNull(phoneNumber) || !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)){
-                        excelErrorTemp.add(new ExcelError(y + 1,"excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
+                    if (Objects.isNull(phoneNumber) || !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
+                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
                     }
                 }
             }
@@ -1230,7 +1243,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             }
             return finalExcelList;
         });
-        return sysUserService.executeSysUserImportLogic(finalList,map);
+        return sysUserService.executeSysUserImportLogic(finalList, map);
     }
 
 

+ 0 - 11
teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/BasicCourseImportDto.java

@@ -26,9 +26,6 @@ public class BasicCourseImportDto {
     @NotNull
     private String clazz;
 
-    @ExcelNote(value = "说明(仅提示用)")
-    private String desc;
-
     public String getCourseName() {
         return courseName;
     }
@@ -60,12 +57,4 @@ public class BasicCourseImportDto {
     public void setClazz(String clazz) {
         this.clazz = clazz;
     }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
 }

+ 22 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/DescribeImportDto.java

@@ -0,0 +1,22 @@
+package com.qmth.teachcloud.common.bean.dto.excel;
+
+import com.qmth.teachcloud.common.annotation.ExcelNote;
+
+/**
+ * @Description: excel导入说明sheet
+ * @Author: CaoZixuan
+ * @Date: 2021-08-23
+ */
+public class DescribeImportDto {
+
+    @ExcelNote(value = "说明")
+    private String describe;
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+}

+ 0 - 11
teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/SysUserImportDto.java

@@ -31,9 +31,6 @@ public class SysUserImportDto {
     @NotNull
     private String roleName;
 
-    @ExcelNote(value = "说明(仅提示用)")
-    private String desc;
-
     public String getName() {
         return name;
     }
@@ -73,12 +70,4 @@ public class SysUserImportDto {
     public void setRoleName(String roleName) {
         this.roleName = roleName;
     }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
 }

+ 5 - 9
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.bean.dto.CourseInfoDto;
 import com.qmth.teachcloud.common.bean.dto.excel.BasicCourseImportDto;
+import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.bean.params.BasicCourseParams;
 import com.qmth.teachcloud.common.bean.result.BasicCourseResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -167,15 +168,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             LinkedMultiValueMap<Integer, Object> excelMap = finalList.get(i);
             List<Object> basicCourseImportDtoList = excelMap.get(i);
             assert basicCourseImportDtoList != null;
-            List<BasicCourseImportDto> datasource = basicCourseImportDtoList.stream().map(e -> {
-                BasicCourseImportDto basicStudentImportDto = new BasicCourseImportDto();
-                BeanUtils.copyProperties(e, basicStudentImportDto);
-                return basicStudentImportDto;
-            }).collect(Collectors.toList());
-            // TODO: 2021/7/16 校验datasource集合的正确性
-            map.put("dataCount", datasource.size());
-            System.out.println("datasource:\n" + datasource);
-
+            if (basicCourseImportDtoList.get(0) instanceof DescribeImportDto){
+                continue;
+            }
+            map.put("dataCount", basicCourseImportDtoList.size());
             for (int y = 0; y < Objects.requireNonNull(basicCourseImportDtoList).size(); y++) {
                 BasicCourseImportDto basicCourseImportDto = (BasicCourseImportDto) basicCourseImportDtoList.get(y);
                 String courseName = basicCourseImportDto.getCourseName();

+ 5 - 9
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -10,6 +10,7 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.bean.dto.LoginDto;
 import com.qmth.teachcloud.common.bean.dto.UserDto;
+import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.SysUserImportDto;
 import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
@@ -486,15 +487,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             LinkedMultiValueMap<Integer, Object> excelMap = finalList.get(i);
             List<Object> sysUserImportDtoList = excelMap.get(i);
             assert sysUserImportDtoList != null;
-            List<SysUserImportDto> datasource = sysUserImportDtoList.stream().map(e -> {
-                SysUserImportDto sysUserImportDto = new SysUserImportDto();
-                BeanUtils.copyProperties(e, sysUserImportDto);
-                return sysUserImportDto;
-            }).collect(Collectors.toList());
-            // TODO: 2021/7/16 校验datasource集合的正确性
-            map.put("dataCount", datasource.size());
-//            System.out.println("datasource:\n" + datasource);
-
+            if (sysUserImportDtoList.get(0) instanceof DescribeImportDto){
+                continue;
+            }
+            map.put("dataCount", sysUserImportDtoList.size());
             for (int y = 0; y < Objects.requireNonNull(sysUserImportDtoList).size(); y++) {
                 SysUserImportDto sysUserImportDto = (SysUserImportDto) sysUserImportDtoList.get(y);
                 String name = sysUserImportDto.getName();