diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 51f9a0fcb6..f132877210 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -394,61 +394,61 @@
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java
new file mode 100644
index 0000000000..80bf086374
--- /dev/null
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java
@@ -0,0 +1,51 @@
+package com.epmet.utils;
+
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+
+/**
+ * 导入任务工具类，用于创建/完成导入工具
+ */
+public class ImportTaskUtils implements ResultDataResolver {
+
+ /**
+ * 创建导入任务，可能抛出8000异常，请考虑捕获异常
+ * @param originFileName 上传的文件的名称
+ * @param bizType 业务类型，见ImportTaskConstants常量
+ * @return Result
+ */
+ public static Result createImportTask(String originFileName, String bizType) {
+ ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
+ form.setOriginFileName(originFileName);
+ form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
+ form.setBizType(bizType);
+
+ return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form);
+ }
+
+ /**
+ * 结束导入任务
+ * @param taskId 任务ID
+ * @param processStatus 处理状态 见ImportTaskConstants
+ * @param resultDescFilePath 结果描述文件的路径
+ * @param resultDesc 结果简要描述文字
+ * @return Result
+ */
+ public static Result finishImportTask(String taskId, String processStatus, String resultDescFilePath, String resultDesc) {
+ ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO();
+ form.setTaskId(taskId);
+ form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID));
+ form.setProcessStatus(processStatus);
+ form.setResultDescFilePath(resultDescFilePath);
+ form.setResultDesc(resultDesc);
+
+ return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form);
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
index 17502c65e0..e65121e55d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
@@ -28,6 +28,7 @@ import com.epmet.dto.result.NatListCommonExcelResultDTO;
import com.epmet.dto.result.NatListResultDTO;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcNatService;
+import com.epmet.utils.ImportTaskUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
@@ -221,12 +222,8 @@ public class IcNatController implements ResultDataResolver {
}
// 2.生成导入任务记录
- ImportTaskCommonFormDTO importTaskForm = new ImportTaskCommonFormDTO();
- importTaskForm.setOperatorId(userId);
- importTaskForm.setBizType(ImportTaskConstants.BIZ_TYPE_IC_NAT);
- importTaskForm.setOriginFileName(originalFilename);
-
- ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(commonServiceOpenFeignClient.createImportTask(importTaskForm),
+ ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException(
+ ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.BIZ_TYPE_IC_NAT),
ServiceConstant.EPMET_COMMON_SERVICE,
EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
"excel导入核酸检测信息错误",
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index 5307df5cb1..2723d47b37 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -40,6 +40,7 @@ import com.epmet.feign.OssFeignClient;
import com.epmet.service.IcNatService;
import com.epmet.service.IcNoticeService;
import com.epmet.service.UserService;
+import com.epmet.utils.ImportTaskUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
@@ -365,30 +366,23 @@ public class IcNatServiceImpl extends BaseServiceImpl imp
}
}
- ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
- importFinishTaskForm.setTaskId(importTaskId);
- importFinishTaskForm.setProcessStatus(failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS);
- importFinishTaskForm.setOperatorId(userId);
- importFinishTaskForm.setResultDesc("");
- importFinishTaskForm.setResultDescFilePath(errorDesFileUrl);
+ // 完成导入
+ Result result = ImportTaskUtils.finishImportTask(importTaskId,
+ failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS,
+ errorDesFileUrl,
+ "");
- Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
if (!result.success()) {
- log.error("【核酸检测导入】finishImportTask失败");
+ log.error("【核酸检测导入】导入记录状态修改为'finished_success'失败");
}
} catch (Exception e) {
String errorMsg = ExceptionUtils.getErrorStackTrace(e);
log.error("【核酸检测导入】出错:{}", errorMsg);
- ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO();
- importFinishTaskForm.setTaskId(importTaskId);
- importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
- importFinishTaskForm.setOperatorId(userId);
- importFinishTaskForm.setResultDesc("导入失败");
+ Result result = ImportTaskUtils.finishImportTask(importTaskId, ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL, null, "导入失败");
- Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
if (!result.success()) {
- log.error("【核酸检测导入】导入记录状态修改为'完成'失败");
+ log.error("【核酸检测导入】导入记录状态修改为'finished_fail'失败");
}
} finally {
// 删除临时文件
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 7e376b57ec..1f27a2999d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl houseResult = govOrgOpenFeignClient.get(user.getHomeId());
- if (!houseResult.success()) {
- throw new RenException(houseResult.getCode(),houseResult.getMsg());
- }
- result.setOwnerName(houseResult.getData().getOwnerName());
-
+ result.setOwnerName("");
//获取用户所在家庭里所有人员信息
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
@@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl