From afb7abd999e1ab92023a2e343bca15c1230b81f6 Mon Sep 17 00:00:00 2001 From: Kris <2893855659@qq.com> Date: Thu, 25 Sep 2025 19:58:57 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20bigobject=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CommonBatchServiceImpl.java | 26 +++++++++---------- .../service/impl/DataVerifyServiceImpl.java | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java index 065cc99..ecbd997 100644 --- a/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/CommonBatchServiceImpl.java @@ -189,13 +189,6 @@ public class CommonBatchServiceImpl implements CommonBatchService { log.info("开始导出BigObject数据, API: {}", api); - // 检测路径是否存在 不存在则创建 - File excel = new File( param.getApi() + "/"); - if (!excel.exists()) { - System.out.println("创建目录: " + param.getApi() + "/"); - boolean mkdir = excel.mkdir(); - } - List fieldList = dataFieldService.list(new QueryWrapper().eq("api", param.getApi())); String fieldStr = fieldList.stream() .map(DataField::getField) @@ -222,22 +215,27 @@ public class CommonBatchServiceImpl implements CommonBatchService { QueryResultList queryResultList = bulkConnect.getQueryResultList(job.getId(), batchInfo.getId()); log.info("获取查询结果列表, 结果数量: {}", queryResultList.getResult().length); - + // 检测路径是否存在 不存在则创建 + Path apiPath = Paths.get(param.getApi()); + if (!Files.exists(apiPath)) { + log.info("创建目录: {}", apiPath); + Files.createDirectories(apiPath); + } // 使用确定性命名策略，避免使用随机时间戳 String fileName = param.getApi() + "/" + DateFormatUtils.format(new Date(), "yyyyMMddHHmmss"); final long maxFileSize = 50 * 1024 * 1024; // 50MB int fileIndex = 0; - String currentFilePath = fileName + "_" + fileIndex + ".csv"; + Path currentFilePath = Paths.get(fileName + "_" + fileIndex + ".csv"); - log.info("开始写入数据到文件 : {}", fileName); + log.info("开始写入数据到文件 : {}", fileName); BufferedWriter bufferedWriter = null; FileWriter fileWriter = null; try { - fileWriter = new FileWriter(currentFilePath, true); + fileWriter = new FileWriter(currentFilePath.toFile(), true); bufferedWriter = new BufferedWriter(fileWriter); long currentFileSize = 0; @@ -264,12 +262,12 @@ public class CommonBatchServiceImpl implements CommonBatchService { fileWriter.close(); } - log.info("当前文件已达到大小限制, 创建新文件. 文件路径: {}, 数据行数: {}", currentFilePath, lineCount); + log.info("当前文件已达到大小限制, 创建新文件. 文件路径: {}, 数据行数: {}", currentFilePath.toString(), lineCount); // 创建新文件 fileIndex++; - currentFilePath = fileName + "_" + fileIndex + ".csv"; - fileWriter = new FileWriter(currentFilePath, true); + currentFilePath = Paths.get(fileName + "_" + fileIndex + ".csv"); + fileWriter = new FileWriter(currentFilePath.toFile(), true); bufferedWriter = new BufferedWriter(fileWriter); currentFileSize = 0; lineCount = 0; diff --git a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java index d6a4635..3aaa99d 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataVerifyServiceImpl.java @@ -1327,7 +1327,7 @@ public class DataVerifyServiceImpl implements DataVerifyService { private List getDataBatches(String objectApi) { return dataBatchService.list(new QueryWrapper() - .eq("name", objectApi) + .eq("name", objectApi).isNotNull("first_sync_date") .orderByDesc("sync_start_date")); } }