refactor: 第二批收敛——公共 Excel 写出器 + 任务收尾零件下沉 + 前端上传区/任务面板抽取
This commit is contained in:
+26
-38
@@ -1,16 +1,15 @@
|
||||
package com.nanri.aiimage.modules.collectdata.service;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
|
||||
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataSummaryRowDto;
|
||||
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataResultRowVo;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.poi.ss.usermodel.Row;
|
||||
import org.apache.poi.ss.usermodel.Sheet;
|
||||
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
@@ -85,17 +84,14 @@ public class CollectDataExcelAssemblyService {
|
||||
if (outputXlsx == null) {
|
||||
throw new BusinessException("生成采集数据 Excel 失败: 输出文件路径为空");
|
||||
}
|
||||
SXSSFWorkbook workbook = new SXSSFWorkbook(200);
|
||||
workbook.setCompressTempFiles(true);
|
||||
SxssfWorkbookWriter writer = SxssfWorkbookWriter.open();
|
||||
// 先写目标同目录的临时文件,成功后原子落位:写入或落位失败时目标路径
|
||||
// 不残留半成品,临时文件由 catch/finally 清理(SXSSF 滚动窗口文件由 dispose 释放)。
|
||||
File tmpFile = new File(outputXlsx.getAbsolutePath() + ".tmp");
|
||||
try {
|
||||
long detailRowCount = writeDetailSheet(workbook, itemsSource);
|
||||
writeSummarySheet(workbook, summaries, rawItemsSource);
|
||||
try (FileOutputStream outputStream = new FileOutputStream(tmpFile)) {
|
||||
workbook.write(outputStream);
|
||||
}
|
||||
long detailRowCount = writeDetailSheet(writer, itemsSource);
|
||||
writeSummarySheet(writer, summaries, rawItemsSource);
|
||||
writer.write(tmpFile);
|
||||
Files.move(tmpFile.toPath(), outputXlsx.toPath(),
|
||||
StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
|
||||
return detailRowCount;
|
||||
@@ -104,11 +100,7 @@ public class CollectDataExcelAssemblyService {
|
||||
deleteQuietly(tmpFile);
|
||||
throw new BusinessException("生成采集数据 Excel 失败: " + ex.getMessage());
|
||||
} finally {
|
||||
try {
|
||||
workbook.close();
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
workbook.dispose();
|
||||
writer.close();
|
||||
deleteQuietly(tmpFile);
|
||||
}
|
||||
}
|
||||
@@ -130,12 +122,10 @@ public class CollectDataExcelAssemblyService {
|
||||
}
|
||||
}
|
||||
|
||||
private long writeDetailSheet(SXSSFWorkbook workbook, RowBatchSource itemsSource) {
|
||||
Sheet sheet = workbook.createSheet(SHEET_DETAIL_NAME);
|
||||
Row headerRow = sheet.createRow(0);
|
||||
private long writeDetailSheet(SxssfWorkbookWriter writer, RowBatchSource itemsSource) {
|
||||
Sheet sheet = writer.createSheet(SHEET_DETAIL_NAME, SHEET_DETAIL_HEADER, null);
|
||||
for (int i = 0; i < SHEET_DETAIL_HEADER.length; i++) {
|
||||
headerRow.createCell(i).setCellValue(SHEET_DETAIL_HEADER[i]);
|
||||
sheet.setColumnWidth(i, (i == 3 ? 24 : 18) * 256);
|
||||
sheet.setColumnWidth(i, SxssfWorkbookWriter.width(i == 3 ? 24 : 18));
|
||||
}
|
||||
// state[0]=下一个写入行号,state[1]=已写明细行数(与原 List 路径 rows.size() 对齐)
|
||||
long[] state = new long[]{1L, 0L};
|
||||
@@ -149,12 +139,12 @@ public class CollectDataExcelAssemblyService {
|
||||
continue;
|
||||
}
|
||||
Row row = sheet.createRow((int) state[0]++);
|
||||
row.createCell(0).setCellValue(safe(item.getBrand()));
|
||||
row.createCell(1).setCellValue(safe(item.getAsin()));
|
||||
row.createCell(2).setCellValue(safe(item.getPrice()));
|
||||
row.createCell(3).setCellValue(safe(item.getSellerName()));
|
||||
row.createCell(4).setCellValue(safe(item.getKeyword()));
|
||||
row.createCell(5).setCellValue(safe(item.getDeliveryMethod()));
|
||||
SxssfWorkbookWriter.setText(row, 0, item.getBrand());
|
||||
SxssfWorkbookWriter.setText(row, 1, item.getAsin());
|
||||
SxssfWorkbookWriter.setText(row, 2, item.getPrice());
|
||||
SxssfWorkbookWriter.setText(row, 3, item.getSellerName());
|
||||
SxssfWorkbookWriter.setText(row, 4, item.getKeyword());
|
||||
SxssfWorkbookWriter.setText(row, 5, item.getDeliveryMethod());
|
||||
state[1]++;
|
||||
}
|
||||
});
|
||||
@@ -168,14 +158,12 @@ public class CollectDataExcelAssemblyService {
|
||||
* - 当 summaries 为空(Python 端尚未接入或解析失败)时,回退到基于 rawItems 自聚合,
|
||||
* 保证 Excel 不会因迁移过渡期而出现空表。等 Python 端全部接入并稳定后,可移除 fallback 分支。
|
||||
*/
|
||||
private void writeSummarySheet(SXSSFWorkbook workbook,
|
||||
private void writeSummarySheet(SxssfWorkbookWriter writer,
|
||||
List<CollectDataSummaryRowDto> summaries,
|
||||
RowBatchSource rawItemsSource) {
|
||||
Sheet sheet = workbook.createSheet(SHEET_SUMMARY_NAME);
|
||||
Row headerRow = sheet.createRow(0);
|
||||
Sheet sheet = writer.createSheet(SHEET_SUMMARY_NAME, SHEET_SUMMARY_HEADER, null);
|
||||
for (int i = 0; i < SHEET_SUMMARY_HEADER.length; i++) {
|
||||
headerRow.createCell(i).setCellValue(SHEET_SUMMARY_HEADER[i]);
|
||||
sheet.setColumnWidth(i, (i == 0 ? 28 : 12) * 256);
|
||||
sheet.setColumnWidth(i, SxssfWorkbookWriter.width(i == 0 ? 28 : 12));
|
||||
}
|
||||
|
||||
if (summaries != null && !summaries.isEmpty()) {
|
||||
@@ -186,18 +174,18 @@ public class CollectDataExcelAssemblyService {
|
||||
continue;
|
||||
}
|
||||
Row row = sheet.createRow(rowIndex++);
|
||||
row.createCell(0).setCellValue(safe(item.getKeyword()));
|
||||
row.createCell(1).setCellValue(intOrZero(item.getFba()));
|
||||
row.createCell(2).setCellValue(intOrZero(item.getFbm()));
|
||||
row.createCell(3).setCellValue(intOrZero(item.getAmz()));
|
||||
row.createCell(4).setCellValue(intOrZero(item.getNoneCount()));
|
||||
SxssfWorkbookWriter.setText(row, 0, item.getKeyword());
|
||||
SxssfWorkbookWriter.setNumber(row, 1, intOrZero(item.getFba()));
|
||||
SxssfWorkbookWriter.setNumber(row, 2, intOrZero(item.getFbm()));
|
||||
SxssfWorkbookWriter.setNumber(row, 3, intOrZero(item.getAmz()));
|
||||
SxssfWorkbookWriter.setNumber(row, 4, intOrZero(item.getNoneCount()));
|
||||
Integer totalPage = item.getTotalPage();
|
||||
if (totalPage != null && totalPage > 0) {
|
||||
row.createCell(5).setCellValue(totalPage);
|
||||
SxssfWorkbookWriter.setNumber(row, 5, totalPage);
|
||||
} else {
|
||||
row.createCell(5).setCellValue("");
|
||||
SxssfWorkbookWriter.setText(row, 5, "");
|
||||
}
|
||||
row.createCell(6).setCellValue(intOrZero(item.getAsinFilter()));
|
||||
SxssfWorkbookWriter.setNumber(row, 6, intOrZero(item.getAsinFilter()));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user