From effff9a72393e54ba192ca63f258229b892a933d Mon Sep 17 00:00:00 2001 From: sswiki <1773266885@qq.com> Date: Mon, 7 Aug 2023 11:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E4=BA=92?= =?UTF-8?q?=E5=AF=BC=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=9D=A1=E6=95=B0=E6=97=B6?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E6=95=B0=E6=8D=AE=E5=BA=93=E5=B0=86=E5=88=AB?= =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=86=99=E4=BA=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/transfer/TransferDataServer.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java index 8d6b64aa..a78e15d5 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java @@ -70,7 +70,7 @@ public class TransferDataServer { } if (sqlExecutor.cancel(executeId)) { DocUserDetails currentUser = DocUserUtil.getCurrentUser(); - String executeInfo = String.format("[%s] %s 手动终止了此任务", DateTime.now().toString(), currentUser.getUsername()); + String executeInfo = String.format("[%s] %s 手动终止了此任务", DateTime.now(), currentUser.getUsername()); dbTransferTaskService.addExecuteInfo(taskId, TransferTaskStatus.CANCEL.getCode(), executeInfo); } else { throw new ConfirmException("终止该任务失败"); @@ -104,7 +104,7 @@ public class TransferDataServer { dbTransferTaskService.resetExecuteInfo(taskId); // 提交任务 ThreadPoolUtil.getThreadPool().submit(() -> { - String executeInfo = String.format("[%s] 任务开始执行", DateTime.now().toString()); + String executeInfo = String.format("[%s] 任务开始执行", DateTime.now()); dbTransferTaskService.addExecuteInfo(taskId, TransferTaskStatus.EXECUTING.getCode(), executeInfo); String executeId = IdUtil.simpleUUID(); taskExecuteMap.put(taskId, executeId); @@ -137,15 +137,16 @@ public class TransferDataServer { executeParam.setSql(selectCountSql); ExecuteResult countResult = sqlExecutor.execute(executeParam); if (CollectionUtils.isEmpty(countResult.getResult())) { - String executeInfo = String.format("[%s] 获取总条数失败", DateTime.now().toString()); + String executeInfo = String.format("[%s] 获取总条数失败", DateTime.now()); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.ERROR.getCode(), executeInfo); return; } - Object transferCount = countResult.getResult().get(0).get("counts"); - String executeInfo = String.format("[%s] 待处理总条数：%s，查询总条数耗时：%sms", DateTime.now().toString(), transferCount, System.currentTimeMillis() - executeStartTime); + Map countMap = countResult.getResult().get(0); + Object transferCount = countMap.values().stream().findAny().orElse(0); + String executeInfo = String.format("[%s] 待处理总条数：%s，查询总条数耗时：%sms", DateTime.now(), transferCount, System.currentTimeMillis() - executeStartTime); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.EXECUTING.getCode(), executeInfo); } else { - String executeInfo = String.format("[%s] 未开启查询总条数，跳过条数查询", DateTime.now().toString()); + String executeInfo = String.format("[%s] 未开启查询总条数，跳过条数查询", DateTime.now()); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.EXECUTING.getCode(), executeInfo); } AtomicLong readCount = new AtomicLong(0L); @@ -153,7 +154,7 @@ public class TransferDataServer { ExecuteResult executeResult = sqlExecutor.execute(factoryBean, executeParam, resultMap -> { selectResultList.add(resultMap); if (readCount.incrementAndGet() % executeCountLogNum == 0) { - String executeInfo = String.format("[%s] 已处理条数：%s", DateTime.now().toString(), readCount.get()); + String executeInfo = String.format("[%s] 已处理条数：%s", DateTime.now(), readCount.get()); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.EXECUTING.getCode(), executeInfo); } // 批量输出数据 @@ -166,15 +167,15 @@ public class TransferDataServer { this.writeData(storageSourceId, storageSql, selectResultList); } if (StringUtils.isNotBlank(executeResult.getErrMsg())) { - String executeInfo = String.format("[%s] 执行出错：%s", DateTime.now().toString(), executeResult.getErrMsg()); + String executeInfo = String.format("[%s] 执行出错：%s", DateTime.now(), executeResult.getErrMsg()); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.ERROR.getCode(), executeInfo); } else { - String executeInfo = String.format("[%s] 任务执行成功，处理总条数：%s，总耗时：%sms", DateTime.now().toString(), readCount.get(), System.currentTimeMillis() - executeStartTime); + String executeInfo = String.format("[%s] 任务执行成功，处理总条数：%s，总耗时：%sms", DateTime.now(), readCount.get(), System.currentTimeMillis() - executeStartTime); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.SUCCESS.getCode(), executeInfo); } } catch (Exception e) { logger.error("SQL执行出错：", e); - String executeInfo = String.format("[%s] 处理出错：%s", DateTime.now().toString(), ExceptionUtils.getStackTrace(e)); + String executeInfo = String.format("[%s] 处理出错：%s", DateTime.now(), ExceptionUtils.getStackTrace(e)); dbTransferTaskService.addExecuteInfo(transferTask.getId(), TransferTaskStatus.ERROR.getCode(), executeInfo); } }