加入easyExcel

sop-business/src/main/java/com/qmth/sop/business/bean/dto/SysUserImportDto.java → sop-business/src/main/java/com/qmth/sop/business/bean/dto/UserArchivesImportDto.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
- * @Description: 用户导入Dto
+ * @Description: 人员档案导入Dto
  * @Param:
  * @return:
  * @Author: wangliang
@@ -19,7 +19,7 @@ import java.io.Serializable;
 @ColumnWidth(value = 30)
 @HeadStyle(fillForegroundColor = 11)
 @HeadFontStyle(color = 1)
-public class SysUserImportDto extends BasicExcelRow implements Serializable {
+public class UserArchivesImportDto extends BasicExcelRow implements Serializable {
 
     //    @ExcelColumn(name = "姓名", index = 0, nullable = true)
     @ExcelProperty(value = "姓名")

sop-business/src/main/java/com/qmth/sop/business/templete/execute/AsyncUserArchivesExportService.java

@@ -0,0 +1,34 @@
+package com.qmth.sop.business.templete.execute;
+
+import com.qmth.sop.business.service.TBTaskService;
+import com.qmth.sop.business.templete.export.AsyncExportTaskTemplete;
+import com.qmth.sop.business.templete.service.TaskLogicService;
+import com.qmth.sop.common.util.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @Description: 用户档案批量导出
+ * @Author: CaoZixuan
+ * @Date: 2021-08-12
+ */
+@Service
+public class AsyncUserArchivesExportService extends AsyncExportTaskTemplete {
+    private final static Logger log = LoggerFactory.getLogger(AsyncUserArchivesExportService.class);
+    public static final String OBJ_TITLE = "用户基本信息";
+
+    @Resource
+    TaskLogicService taskLogicService;
+
+    @Resource
+    TBTaskService tbTaskService;
+
+    @Override
+    public Result exportTask(Map<String, Object> map) throws Exception {
+        return null;
+    }
+}

sop-business/src/main/java/com/qmth/sop/business/templete/execute/AsyncSysUserDataImportService.java → sop-business/src/main/java/com/qmth/sop/business/templete/execute/AsyncUserArchivesImportService.java

@@ -2,7 +2,7 @@ package com.qmth.sop.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.sop.business.bean.dto.SysUserImportDto;
+import com.qmth.sop.business.bean.dto.UserArchivesImportDto;
 import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.TBTaskService;
 import com.qmth.sop.business.templete.importData.AsyncImportTaskTemplete;
@@ -31,9 +31,9 @@ import java.util.StringJoiner;
  * @Date: 2021-08-12
  */
 @Service
-public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
-    private final static Logger log = LoggerFactory.getLogger(AsyncSysUserDataImportService.class);
-    public static final String OBJ_TITLE = "用户基本信息";
+public class AsyncUserArchivesImportService extends AsyncImportTaskTemplete {
+    private final static Logger log = LoggerFactory.getLogger(AsyncUserArchivesImportService.class);
+    public static final String OBJ_TITLE = "人员档案信息";
 
     @Resource
     TaskLogicService taskLogicService;
@@ -50,11 +50,11 @@ public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
         try {
             tbTask.setSummary(stringJoinerSummary.toString());
             // 执行导入基础用户数据
-            Map<String, Object> result = taskLogicService.executeImportSysUserLogic(map);
-            LinkedMultiValueMap<String, SysUserImportDto> sysUserImportDtoLinkedMultiValueMap = (LinkedMultiValueMap<String, SysUserImportDto>) result.get(SystemConstant.EXCEL_DATA);
+            Map<String, Object> result = taskLogicService.executeImportUserArchivesLogic(map);
+            LinkedMultiValueMap<String, UserArchivesImportDto> userArchivesImportDtoLinkedMultiValueMap = (LinkedMultiValueMap<String, UserArchivesImportDto>) result.get(SystemConstant.EXCEL_DATA);
             String errorList = (String) result.get(SystemConstant.EXCEL_DATA_ERROR);
-            int successSize = Objects.nonNull(sysUserImportDtoLinkedMultiValueMap.get(BasicExcelListener.SUCCESS)) ? sysUserImportDtoLinkedMultiValueMap.get(BasicExcelListener.SUCCESS).size() : 0;
-            int errorSize = Objects.nonNull(sysUserImportDtoLinkedMultiValueMap.get(BasicExcelListener.ERROR)) ? sysUserImportDtoLinkedMultiValueMap.get(BasicExcelListener.ERROR).size() : 0;
+            int successSize = Objects.nonNull(userArchivesImportDtoLinkedMultiValueMap.get(BasicExcelListener.SUCCESS)) ? userArchivesImportDtoLinkedMultiValueMap.get(BasicExcelListener.SUCCESS).size() : 0;
+            int errorSize = Objects.nonNull(userArchivesImportDtoLinkedMultiValueMap.get(BasicExcelListener.ERROR)) ? userArchivesImportDtoLinkedMultiValueMap.get(BasicExcelListener.ERROR).size() : 0;
             stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}{4}{5}{6}{7}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE, (successSize + errorSize), FINISH_TOTAL_SIZE, successSize, FINISH_SUCCESS_SIZE, errorSize, FINISH_ERROR_SIZE));
             if (Objects.nonNull(errorList) && !Objects.equals(errorList, "")) {
                 tbTask.setResult(TaskResultEnum.ERROR);

sop-business/src/main/java/com/qmth/sop/business/templete/service/TaskLogicService.java

@@ -12,11 +12,11 @@ import java.util.Map;
 public interface TaskLogicService {
 
     /**
-     * 处理导入用户数据
+     * 处理导入人员档案数据
      *
      * @param map 数据源
      * @return 结果
      * @throws Exception 异常
      */
-    Map<String, Object> executeImportSysUserLogic(Map<String, Object> map) throws Exception;
+    Map<String, Object> executeImportUserArchivesLogic(Map<String, Object> map) throws Exception;
 }

sop-business/src/main/java/com/qmth/sop/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1,7 +1,7 @@
 package com.qmth.sop.business.templete.service.impl;
 
 import com.alibaba.excel.EasyExcel;
-import com.qmth.sop.business.bean.dto.SysUserImportDto;
+import com.qmth.sop.business.bean.dto.UserArchivesImportDto;
 import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.templete.service.TaskLogicService;
 import com.qmth.sop.business.util.ImportExportUtil;
@@ -34,7 +34,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     ImportExportUtil importExportUtil;
 
     /**
-     * 处理导入用户数据
+     * 处理导入人员档案数据
      *
      * @param map 数据源
      * @return
@@ -42,23 +42,23 @@ public class TaskLogicServiceImpl implements TaskLogicService {
      */
     @Override
     @Transactional
-    public Map<String, Object> executeImportSysUserLogic(Map<String, Object> map) throws Exception {
+    public Map<String, Object> executeImportUserArchivesLogic(Map<String, Object> map) throws Exception {
         InputStream inputStream = null;
         try {
             TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
             inputStream = importExportUtil.getUploadFileInputStream(tbTask);
-            LinkedMultiValueMap<String, SysUserImportDto> sysUserImportDtoLinkedMultiValueMap = new LinkedMultiValueMap<>();
+            LinkedMultiValueMap<String, UserArchivesImportDto> userArchivesImportDtoLinkedMultiValueMap = new LinkedMultiValueMap<>();
             StringJoiner errorData = new StringJoiner("");
-            EasyExcel.read(inputStream, SysUserImportDto.class, new BasicExcelListener<SysUserImportDto>() {
+            EasyExcel.read(inputStream, UserArchivesImportDto.class, new BasicExcelListener<UserArchivesImportDto>() {
 
                 @Override
-                public void handle(LinkedMultiValueMap<String, SysUserImportDto> dataList, StringJoiner errorDataSj) {
-                    sysUserImportDtoLinkedMultiValueMap.addAll(dataList);
+                public void handle(LinkedMultiValueMap<String, UserArchivesImportDto> dataList, StringJoiner errorDataSj) {
+                    userArchivesImportDtoLinkedMultiValueMap.addAll(dataList);
                     errorData.add(errorDataSj.toString());
                 }
             }).headRowNumber(2).sheet(0).doRead();
 
-            map.computeIfAbsent(SystemConstant.EXCEL_DATA, v -> sysUserImportDtoLinkedMultiValueMap);
+            map.computeIfAbsent(SystemConstant.EXCEL_DATA, v -> userArchivesImportDtoLinkedMultiValueMap);
             map.computeIfAbsent(SystemConstant.EXCEL_DATA_ERROR, v -> errorData.toString());
 
             //处理数据逻辑

sop-server/src/main/java/com/qmth/sop/server/api/SysUserController.java

@@ -4,7 +4,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.EditResult;
 import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.TBTaskService;
-import com.qmth.sop.business.templete.execute.AsyncSysUserDataImportService;
+import com.qmth.sop.business.templete.execute.AsyncUserArchivesImportService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.TaskTypeEnum;
 import com.qmth.sop.common.util.Result;
@@ -36,7 +36,7 @@ public class SysUserController {
     TBTaskService tbTaskService;
 
     @Resource
-    AsyncSysUserDataImportService asyncSysUserDataImportService;
+    AsyncUserArchivesImportService asyncSysUserDataImportService;
 
     @ApiOperation(value = "用户导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)