新增：

1.commonservice中导入任务相关的接口
修改：
1.居民信息导入中调用commonservice中的

epmet-user/epmet-user-client/src/main/java/com/epmet/constant/ImportTaskConstants.java → epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java

@@ -1,11 +1,11 @@
-package com.epmet.constant;
+package com.epmet.constants;
 
 /**
  * 导入任务的业务类型常量
  */
 public interface ImportTaskConstants {
     /**
-     * 居民
+     * 业务类型：居民
      */
     String BIZ_TYPE_RESI = "resi";
 

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ImportTaskCommonFormDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ImportTaskCommonFormDTO {
+
+    public interface Create {}
+    public interface Finish {}
+
+    /**
+     * 操作者ID
+     */
+    @NotBlank(message = "操作者ID必填", groups = { Create.class, Finish.class })
+    private String operatorId;
+
+    /**
+     * 业务类型
+     */
+    @NotBlank(message = "业务类型必填", groups = { Create.class })
+    private String bizType;
+
+    /**
+     * 任务ID
+     */
+    @NotBlank(message = "任务ID必填", groups = { Finish.class })
+    private String taskId;
+
+    /**
+     * 处理状态
+     */
+    @NotBlank(message = "处理状态必填", groups = { Finish.class })
+    private String processStatus;
+
+    /**
+     * 结果文件 url
+     */
+    private String resultDescFilePath;
+
+    /**
+     * 结果描述文本
+     */
+    private String resultDesc;
+
+}

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

@@ -0,0 +1,14 @@
+package com.epmet.dto.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ImportTaskCommonResultDTO {
+
+    private String taskId;
+
+}

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java

@@ -4,12 +4,12 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallback;
 import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 import java.util.Map;
@@ -124,4 +124,20 @@ public interface EpmetCommonServiceOpenFeignClient {
      **/
     @PostMapping(value = "commonservice/areacode/addareacode", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> addAreaCode(AddAreaCodeFormDTO formDTO);
+
+    /**
+     * 创建导入任务
+     * @param input
+     * @return
+     */
+    @RequestMapping("/commonservice/import-task/create")
+    Result<ImportTaskCommonResultDTO> createImportTask(@RequestBody ImportTaskCommonFormDTO input);
+
+    /**
+     * 结束导入任务
+     * @param input
+     * @return
+     */
+    @RequestMapping("/commonservice/import-task/finish")
+    Result finishImportTask(@RequestBody ImportTaskCommonFormDTO input);
 }

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@@ -111,4 +111,14 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
     public Result<String> addAreaCode(AddAreaCodeFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "addAreaCode", formDTO);
     }
+
+    @Override
+    public Result createImportTask(ImportTaskCommonFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "createImportTask", input);
+    }
+
+    @Override
+    public Result finishImportTask(ImportTaskCommonFormDTO input) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "finishImportTask", input);
+    }
 }

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

@@ -0,0 +1,57 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.service.ImportTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+
+@RestController
+@RequestMapping("import-task")
+public class ImportTaskController {
+
+    @Autowired
+    private ImportTaskService importTaskService;
+
+    /**
+     * 创建导入任务
+     * @param input
+     * @return
+     */
+    @RequestMapping("create")
+    public Result<ImportTaskCommonResultDTO> createTask(@RequestBody ImportTaskCommonFormDTO input) {
+        ValidatorUtils.validateEntity(input, ImportTaskCommonFormDTO.Create.class);
+        String operatorId = input.getOperatorId();
+        String bizType = input.getBizType();
+
+        String taskId = importTaskService.createProcessTask(operatorId, bizType);
+        ImportTaskCommonResultDTO ro = new ImportTaskCommonResultDTO(taskId);
+        return new Result().ok(ro);
+    }
+
+    /**
+     * 结束任务
+     * @param input
+     * @return
+     */
+    @RequestMapping("finish")
+    public Result finishTask(@RequestBody ImportTaskCommonFormDTO input) {
+        ValidatorUtils.validateEntity(input, ImportTaskCommonFormDTO.Finish.class);
+        Boolean finished = importTaskService.finish(input.getTaskId(), input.getProcessStatus(), input.getOperatorId(), input.getResultDescFilePath(), input.getResultDesc());
+        if (!finished) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                    "失败，请确认任务是否存在，以及是否已完成",
+                    "失败，请确认任务是否存在，以及是否已完成");
+        }
+        return new Result();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-02-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("import_task")
+public class ImportTaskEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 业务类型。resi:居民；楼栋:building；房屋:house。依次补充
+     */
+	private String bizType;
+
+    /**
+     * 处理状态。processing:处理中；finished:完成；
+     */
+	private String processStatus;
+
+    /**
+     * 谁导入的
+     */
+	private String operatorId;
+
+    /**
+     * 开始导入的时间
+     */
+	private Date startTime;
+
+	private String resultDescFile;
+
+	private String resultDesc;
+
+}

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

@@ -9,13 +9,13 @@ package com.epmet.service;
  */
 public interface ImportTaskService {
 
-    /**
+//    /**
-     * 检查指定类型该用户是否存在处理中的导入任务
+//     * 检查指定类型该用户是否存在处理中的导入任务
-     * @param operatorId 操作者ID
+//     * @param operatorId 操作者ID
-     * @param bizType 业务类型。resi：居民
+//     * @param bizType 业务类型。resi：居民
-     * @return
+//     * @return
-     */
+//     */
-    boolean existsProcessingTask(String operatorId, String bizType);
+//    boolean existsProcessingTask(String operatorId, String bizType);
 
     /**
      * 创建处理任务

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

@@ -1,7 +1,9 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.epmet.constant.ImportTaskConstants;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.ImportTaskDao;
 import com.epmet.entity.ImportTaskEntity;
 import com.epmet.service.ImportTaskService;
@@ -22,13 +24,28 @@ public class ImportTaskServiceImpl implements ImportTaskService {
     @Autowired
     private ImportTaskDao importRecordDao;
 
+//    /**
+//     * 该用户，该业务类型，是否有正在处理的导入任务
+//     * @param operatorId 操作者ID
+//     * @param bizType 业务类型。resi：居民
+//     * @return
+//     */
+//    @Override
+//    public boolean existsProcessingTask(String operatorId, String bizType) {
+//        LambdaQueryWrapper<ImportTaskEntity> query = new LambdaQueryWrapper<>();
+//        query.eq(ImportTaskEntity::getOperatorId, operatorId);
+//        query.eq(ImportTaskEntity::getBizType, bizType);
+//        query.eq(ImportTaskEntity::getProcessStatus, ImportTaskConstants.PROCESS_STATUS_PROCESSING);
+//
+//        return importRecordDao.selectCount(query) > 0;
+//    }
+
     /**
-     * 该用户，该业务类型，是否有正在处理的导入任务
+     * 检查是否有正在执行的任务
-     * @param operatorId 操作者ID
+     * @param operatorId
-     * @param bizType 业务类型。resi：居民
+     * @param bizType
      * @return
      */
-    @Override
     public boolean existsProcessingTask(String operatorId, String bizType) {
         LambdaQueryWrapper<ImportTaskEntity> query = new LambdaQueryWrapper<>();
         query.eq(ImportTaskEntity::getOperatorId, operatorId);
@@ -40,6 +57,12 @@ public class ImportTaskServiceImpl implements ImportTaskService {
 
     @Override
     public String createProcessTask(String operatorId, String bizType) {
+        if (existsProcessingTask(operatorId, bizType)) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+                    "已存在执行中的导入任务，请等待执行完成。",
+                    "已存在执行中的导入任务，请等待执行完成。");
+        }
+
         ImportTaskEntity importRecord = new ImportTaskEntity();
         importRecord.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_PROCESSING);
         importRecord.setOperatorId(operatorId);

epmet-user/epmet-user-server/pom.xml

@@ -154,6 +154,11 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>common-service-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -33,6 +33,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -44,19 +45,19 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.constant.ImportTaskConstants;
 import com.epmet.constant.SystemMessageType;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.support.ExportResiUserItemDTO;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcResiUserImportService;
 import com.epmet.service.IcResiUserService;
-import com.epmet.service.ImportTaskService;
 import jodd.io.FileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
@@ -93,7 +94,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("icresiuser")
-public class IcResiUserController {
+public class IcResiUserController implements ResultDataResolver {
 
     /**
      * 居民上传临时目录
@@ -123,9 +124,6 @@ public class IcResiUserController {
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private LoginUserUtil loginUserUtil;
-    @Autowired
-    private ImportTaskService importTaskService;
-
 
     /**
      * 模板枚举
@@ -443,14 +441,9 @@ public class IcResiUserController {
         String importTaskId;
 
         // 记录导入任务
-        if (importTaskService.existsProcessingTask(operatorId, ImportTaskConstants.BIZ_TYPE_RESI)) {
+        importTaskId = icResiUserImportService.createImportTaskRecord(operatorId, ImportTaskConstants.BIZ_TYPE_RESI);
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
-                    "已存在执行中的导入任务，请等待执行完成。",
-                    "已存在执行中的导入任务，请等待执行完成。");
-        } else {
-            importTaskId = importTaskService.createProcessTask(operatorId, ImportTaskConstants.BIZ_TYPE_RESI);
-        }
 
+        // 开始执行导入
         Path savePath = null;
         try {
             String fileName = UUID.randomUUID().toString().concat(".").concat(extension);
@@ -464,9 +457,8 @@ public class IcResiUserController {
             String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
             log.error("【导入居民信息失败】导入失败：{}", errorMsg);
 
-            // 要将导入任务状态设置为结束但不成功
+            // 要将导入任务状态设置为结束但不成功。不报错即成功，没有返回值 TODO 此处要改，将oss返回的路径存储到resultDescPath中
-            importTaskService.finish(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, operatorId, null, e.getMessage());
+            icResiUserImportService.finishImportTask(importTaskId, operatorId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, null);
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         } finally {
             try {
                 if (savePath != null){

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

@@ -13,4 +13,22 @@ import java.util.List;
 public interface IcResiUserImportService {
 
     void importIcResiInfoFromExcel(String importTaskId, List<FormItemResult> formItemList, String excelPathName, HttpServletResponse response);
+
+    /**
+     * 创建导入任务
+     * @param operatorId
+     * @param bizType
+     * @return
+     */
+    String createImportTaskRecord(String operatorId, String bizType);
+
+    /**
+     * 完成导入任务
+     * @param importTaskId 任务ID
+     * @param operatorId 操作者ID
+     * @param processStatus 处理状态,见 ImportTaskConstants.PROCESS_STATUS_*
+     * @param resultDesc 结果描述，非必填
+     * @param resultDescPath 结果描述文件，excel等文件，有错误的话需要传入，成功则不需要
+     */
+    void finishImportTask(String importTaskId, String operatorId, String processStatus, String resultDesc, String resultDescPath);
 }

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

@@ -24,7 +24,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.ImportTaskConstants;
+import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserChangeDetailedDao;
 import com.epmet.dao.IcUserChangeRecordDao;
@@ -38,10 +38,7 @@ import com.epmet.entity.IcUserChangeRecordEntity;
 import com.epmet.entity.IcUserTransferRecordEntity;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.handler.IcResiImportDynamicExcelListener;
-import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.feign.*;
-import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.*;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -127,8 +124,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private RedisUtils redisUtils;
 
     @Autowired
-    private ImportTaskService importTaskService;
+    private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
-
 
     /**
      * 字表中不需要的列
@@ -291,11 +287,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             // 更新上传记录
             if (hasErrorRows) {
-                importTaskService.finish(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, loginUserId,
+                finishImportTask(importTaskId, loginUserId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL,null, null);
-                        null, null);
             } else {
-                importTaskService.finish(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, loginUserId,
+                finishImportTask(importTaskId, loginUserId, ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,null, null);
-                        null, null);
             }
 
         } catch (Exception e) {
@@ -1755,45 +1749,45 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         return recordEntity;
     }
 
+    /**
+     * 创建导入任务
+     * @param operatorId
+     * @param bizType
+     * @return
+     */
+    public String createImportTaskRecord(String operatorId, String bizType) {
+        ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
+        importTaskForm.setOperatorId(operatorId);
+        importTaskForm.setBizType(bizType);
+        ImportTaskCommonResultDTO resultDTO = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
+                ServiceConstant.EPMET_COMMON_SERVICE,
+                EpmetErrorCode.SERVER_ERROR.getCode(),
+                "【居民信息导入】创建导入任务记录失败",
+                "【居民信息导入】创建导入任务记录失败");
 
+        return resultDTO.getTaskId();
+    }
 
+    /**
+     * 完成导入任务
+     * @param importTaskId 任务ID
+     * @param operatorId 操作者ID
+     * @param processStatus 处理状态,见 ImportTaskConstants.PROCESS_STATUS_*
+     * @param resultDesc 结果描述，非必填
+     * @param resultDescPath 结果描述文件，excel等文件，有错误的话需要传入，成功则不需要
+     */
+    public void finishImportTask(String importTaskId, String operatorId, String processStatus, String resultDesc, String resultDescPath) {
+        ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
+        importFinishTaskForm.setTaskId(importTaskId);
+        importFinishTaskForm.setProcessStatus(processStatus);
+        importFinishTaskForm.setOperatorId(operatorId);
+        importFinishTaskForm.setResultDesc(resultDesc);
+        importFinishTaskForm.setResultDescFilePath(resultDescPath);
 
-    //private IcUserTransferRecordEntity fillTransferRecord(String resiId, String resiName, String operatorId, String operatorName, String oldCustomerId,
+        Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
-    //                                                      String oldAgencyId, String oldAgencyName, String oldGridId, String oldGridName, String neighborhoodId,
+        if (result == null || !result.success()) {
-    //                                                      String neighborhoodName, String oldBuildingId, String oldBuildingName, ) {
+            log.error("【居民信息导入】结束导入任务失败:taskId:{}, processStatus:{}, operatorId:{}, resultDesc:{}, resultDescPath:{}",
-
+                    importTaskId, processStatus, operatorId, resultDesc, resultDescPath);
-        //IcUserTransferRecordEntity recordEntity = new IcUserTransferRecordEntity();
+        }
-        //recordEntity.setIcUserId();
+    }
-        //recordEntity.setOperatorId();
-        //recordEntity.setIcUserName();
-        //recordEntity.setOperatorName();
-        //recordEntity.setOldCustomerId();
-        //recordEntity.setOldAgencyId();
-        //recordEntity.setOldAgencyName();
-        //recordEntity.setOldGridId();
-        //recordEntity.setOldGridName();
-        //recordEntity.setOldNeighborHoodId();
-        //recordEntity.setOldNeighborHoodName();
-        //recordEntity.setOldBuildingId();
-        //recordEntity.setOldBuildingName();
-        //recordEntity.setOldBuildingUnitId();
-        //recordEntity.setOldBuildingUnitName();
-        //recordEntity.setOldHouseId();
-        //recordEntity.setOldHouseName();
-        //recordEntity.setTransferTime();
-        //recordEntity.setRemark();
-        //recordEntity.setNewCustomerId();
-        //recordEntity.setNewAgencyId();
-        //recordEntity.setNewAgencyName();
-        //recordEntity.setNewGridId();
-        //recordEntity.setNewGridName();
-        //recordEntity.setNewNeighborHoodId();
-        //recordEntity.setNewNeighborHoodName();
-        //recordEntity.setNewBuildingId();
-        //recordEntity.setNewBuildingName();
-        //recordEntity.setNewBuildingUnitId();
-        //recordEntity.setNewBuildingUnitName();
-        //recordEntity.setNewHouseId();
-        //recordEntity.setNewHouseName();
-    //}
 }