增加导入记录按照id查询

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/ImportTaskCommonResultDTO.java

@@ -40,4 +40,7 @@ public class ImportTaskCommonResultDTO implements Serializable {
      */
     private String resultDescFile;
 
+    private Integer successItemsQty;
+    private Integer failItemsQty;
+
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java

@@ -21,6 +21,19 @@ public class ImportTaskController {
     @Autowired
     private ImportTaskService importTaskService;
 
+    /**
+     * @description: 通过id查找
+     * @param taskId:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/20 2:17 PM
+     */
+    @RequestMapping("/getById")
+    public Result<ImportTaskCommonResultDTO> getById(@RequestParam("taskId") String taskId) {
+        ImportTaskCommonResultDTO r = importTaskService.getById(taskId);
+        return new Result<ImportTaskCommonResultDTO>().ok(r);
+    }
+
     /**
      * desc:分页获取个人导入记录
      * @param tokenDto

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/entity/ImportTaskEntity.java

@@ -54,4 +54,7 @@ public class ImportTaskEntity extends BaseEpmetEntity {
 
 	private String resultDesc;
 
+	private Integer successItemsQty;
+	private Integer failItemsQty;
+
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java

@@ -52,4 +52,6 @@ public interface ImportTaskService {
      * @return
      */
     Boolean processingTaskCheck(String bizType);
+
+    ImportTaskCommonResultDTO getById(String taskId);
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java

@@ -121,4 +121,12 @@ public class ImportTaskServiceImpl implements ImportTaskService {
 
         return importRecordDao.selectCount(query) > 0;
     }
+
+    @Override
+    public ImportTaskCommonResultDTO getById(String taskId) {
+        ImportTaskEntity task = importRecordDao.selectById(taskId);
+        ImportTaskCommonResultDTO r = ConvertUtils.sourceToTarget(task, ImportTaskCommonResultDTO.class);
+        r.setTaskId(taskId);
+        return r;
+    }
 }

epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml

@@ -12,6 +12,8 @@
         <result property="startTime" column="START_TIME"/>
         <result property="resultDescFile" column="RESULT_DESC_FILE"/>
         <result property="resultDesc" column="RESULT_DESC"/>
+        <result property="successItemsQty" column="SUCCESS_ITEMS_QTY"/>
+        <result property="failItemsQty" column="FAIL_ITEMS_QTY"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java

@@ -61,14 +61,13 @@ public class LingShanSpecialCrowdController {
 
         // 2.执行业务导入
         try {
-            lingShanSpecialCrowdService.importSpecialCrowd(crowdCategory, fileSavePath.toString(), originalFilename);
+            String taskId = lingShanSpecialCrowdService.importSpecialCrowd(crowdCategory, fileSavePath.toString(), originalFilename);
+            return new Result().ok(taskId);
         } catch (Exception e) {
             // 3.出错的话，删除文件
             FileUtils.deleteFileIfExists(fileSavePath);
             throw e;
         }
-
-        return new Result();
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/LingShanSpecialCrowdService.java

@@ -16,11 +16,11 @@ public interface LingShanSpecialCrowdService {
      * @description: 导入特殊人群
      * @param crowdCategory:
      * @param fileSavePath:
-     * @return
+     * @return taskId 导入任务id
      * @author: WangXianZhang
      * @date: 2023/4/18 5:42 PM
      */
-    void importSpecialCrowd(String crowdCategory, String fileSavePath, String originFilename);
+    String importSpecialCrowd(String crowdCategory, String fileSavePath, String originFilename);
 
     /**
      * @description: 数据校验

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java

@@ -88,7 +88,7 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
     private OssFeignClient ossFeignClient;
 
     @Override
-    public void importSpecialCrowd(String crowdCategory, String fileSavePath, String originFilename) {
+    public String importSpecialCrowd(String crowdCategory, String fileSavePath, String originFilename) {
         Class<? extends LingShanSpecialCrowdDetailBaseExcelData> excelDataClass;
         AbstractLingShanSpecialCrowdExcelImportListener listener;
         LingShanSpecialCrowdTypeEnums specialCrowdTypeEnum;
@@ -135,7 +135,6 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
         // 正式开始导入。异步导入
         listener.setValidateHeaderOnly(false);
 
-        CompletableFuture.runAsync(() -> {
         // 创建导入任务
         ImportTaskCommonResultDTO importTaskRst = getResultDataOrThrowsException(ImportTaskUtils.createImportTask(originFilename,
                         BizTypeEnum.SPECIAL_CROWD.getType()),
@@ -143,6 +142,7 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
                 null, "【灵山街道-导入特殊人群】创建导入任务失败");
 
+        CompletableFuture.runAsync(() -> {
             try {
                 EasyExcel.read(fileSavePath, excelDataClass, listener)
                         .headRowNumber(specialCrowdTypeEnum.getHeaderRowNumber())
@@ -169,6 +169,8 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
                 FileUtils.deleteFileIfExists(fileSavePath);
             }
         }, executorService);
+
+        return importTaskRst.getTaskId();
     }
 
     /**