From a99c14d85a5ab2ccb0c9ace8d469b4f61c3aa8f3 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 19 Apr 2023 19:31:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9Aimport=20task=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E5=8A=9F=E6=9D=A1=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/ImportTaskCommonFormDTO.java | 10 ++++++++++ .../src/main/java/com/epmet/utils/ImportTaskUtils.java | 8 +++++++- .../com/epmet/controller/ImportTaskController.java | 8 +++++++- .../src/main/java/com/epmet/dao/ImportTaskDao.java | 10 ++++++---- .../main/java/com/epmet/service/ImportTaskService.java | 3 ++- .../com/epmet/service/impl/ImportTaskServiceImpl.java | 5 +++-- .../db/migration/V0.0.15__importtask_add_number.sql | 2 ++ .../src/main/resources/mapper/ImportTaskDao.xml | 2 ++ 8 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.15__importtask_add_number.sql diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ImportTaskCommonFormDTO.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ImportTaskCommonFormDTO.java index 08fc2f0995..b64b8eb505 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ImportTaskCommonFormDTO.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/form/ImportTaskCommonFormDTO.java @@ -56,4 +56,14 @@ public class ImportTaskCommonFormDTO extends PageFormDTO { */ private String resultDesc; + /** + * 成功行数 + */ + private Integer successItemsQty; + + /** + * 失败行数 + */ + private Integer failItemsQty; + } 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 index 80bf086374..a8b08efd29 100644 --- 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 @@ -21,11 +21,17 @@ public class ImportTaskUtils implements ResultDataResolver { * @return Result */ public static Result createImportTask(String originFileName, String bizType) { + return createImportTask(originFileName, bizType, null, null); + } + + public static Result createImportTask(String originFileName, String bizType, + Integer successItemsQty, Integer failItemsQty) { ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO(); form.setOriginFileName(originFileName); form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID)); form.setBizType(bizType); - + form.setSuccessItemsQty(successItemsQty); + form.setFailItemsQty(failItemsQty); return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).createImportTask(form); } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java index 8b03c4465b..d1d43b148b 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java @@ -59,7 +59,13 @@ public class ImportTaskController { @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()); + Boolean finished = importTaskService.finish(input.getTaskId(), + input.getProcessStatus(), + input.getOperatorId(), + input.getResultDescFilePath(), + input.getResultDesc(), + input.getSuccessItemsQty(), + input.getFailItemsQty()); if (!finished) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "失败，请确认任务是否存在，以及是否已完成", diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ImportTaskDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ImportTaskDao.java index 1306b7e3cd..a758f2f33a 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ImportTaskDao.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ImportTaskDao.java @@ -24,8 +24,10 @@ public interface ImportTaskDao extends BaseDao { * @return */ int finish(@Param("taskId") String taskId, - @Param("process_status") String processStatus, - @Param("operatorId") String operatorId, - @Param("resultDesc") String resultDesc, - @Param("resultDescFile") String resultDescFile); + @Param("process_status") String processStatus, + @Param("operatorId") String operatorId, + @Param("resultDesc") String resultDesc, + @Param("resultDescFile") String resultDescFile, + @Param("successItemsQty") Integer successItemsQty, + @Param("failItemsQty") Integer failItemsQty); } \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java index 918643d8f2..bb1acf5c36 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ImportTaskService.java @@ -36,7 +36,8 @@ public interface ImportTaskService { * @param resultDescFile 结果描述文件 * @param resultDesc 结果描述文本 */ - Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc); + Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc, + Integer successItemsQty, Integer failItemsQty); /** * desc：分页获取个人导入记录 diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java index 3aea2a5b23..f81e4cc949 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ImportTaskServiceImpl.java @@ -89,8 +89,9 @@ public class ImportTaskServiceImpl implements ImportTaskService { } @Override - public Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc) { - return importRecordDao.finish(taskId, processStatus, operatorId, resultDesc, resultDescFile) > 0; + public Boolean finish(String taskId, String processStatus, String operatorId, String resultDescFile, String resultDesc, + Integer successItemsQty, Integer failItemsQty) { + return importRecordDao.finish(taskId, processStatus, operatorId, resultDesc, resultDescFile, successItemsQty, failItemsQty) > 0; } @Override diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.15__importtask_add_number.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.15__importtask_add_number.sql new file mode 100644 index 0000000000..93ea507a26 --- /dev/null +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.15__importtask_add_number.sql @@ -0,0 +1,2 @@ +alter table import_task add column SUCCESS_ITEMS_QTY int comment '成功条数' after RESULT_DESC; +alter table import_task add column FAIL_ITEMS_QTY int comment '失败条数' after SUCCESS_ITEMS_QTY; \ No newline at end of file diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml index fce694cb16..df58afb615 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ImportTaskDao.xml @@ -26,6 +26,8 @@ set PROCESS_STATUS = #{process_status}, RESULT_DESC = #{resultDesc}, RESULT_DESC_FILE = #{resultDescFile}, + SUCCESS_ITEMS_QTY = #{successItemsQty}, + FAIL_ITEMS_QTY = #{failItemsQty}, UPDATED_BY=#{operatorId}, UPDATED_TIME=NOW() where ID=#{taskId}