latest) {
@@ -1040,19 +1033,11 @@ public class ShopMatchTaskService {
}
private TaskDistributedLockService.LockHandle acquireTaskLockOrThrow(Long taskId) {
- TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskId);
- if (lockHandle == null) {
- log.warn("[shop-match] 任务锁竞争,拒绝本次提交 taskId={}", taskId);
- throw new BusinessException(BusinessCodes.TASK_BUSY, "任务正在处理中,请稍后再试");
- }
- return lockHandle;
+ return TaskFinalizeSupport.acquireTaskLockOrThrow(taskDistributedLockService, MODULE_TYPE, taskId, "shop-match");
}
private TaskDistributedLockService.LockHandle acquireTaskLock(Long taskId) {
- if (taskId == null || taskId <= 0) {
- return null;
- }
- return taskDistributedLockService.acquire(MODULE_TYPE, taskId);
+ return TaskFinalizeSupport.acquireTaskLock(taskDistributedLockService, MODULE_TYPE, taskId);
}
/**
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java
new file mode 100644
index 000000000..b522646da
--- /dev/null
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java
@@ -0,0 +1,190 @@
+package com.nanri.aiimage.modules.task.service;
+
+import com.nanri.aiimage.common.exception.BusinessCodes;
+import com.nanri.aiimage.common.exception.BusinessException;
+import com.nanri.aiimage.config.TaskPressureProperties;
+import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
+import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
+import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
+import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
+/**
+ * 业务模块 *TaskService 收尾/执行骨架的公共零件(无状态静态工具):
+ * 任务实体加载(模块缓存优先、DB 兜底)、分批任务加载、结果行失败落库、任务分布式锁获取。
+ *
+ * 此前这些零件在 8 个业务模块的 *TaskService 里逐行同构复制(loadTaskForExecution /
+ * loadTaskMapByIds / markResultFailed / acquireTaskLock / acquireTaskLockOrThrow /
+ * selectTasksByIdsInBatches),差异点只有三类,均已参数化:
+ *
+ * - 模块标识 {@code moduleType}(数据隔离与锁键);
+ * - 模块任务缓存服务 {@link AbstractModuleTaskCacheService};
+ * - 锁竞争日志标签 {@code logTag}(如 {@code [price-track]})。
+ *
+ *
+ * 已知的非同构变体不强制收敛,调用方保留本地实现:
+ * PriceTrack 的 loadTaskForExecution 要求缓存行 requestJson 非空(用带 Predicate 的重载);
+ * ShopMatch 的 loadTaskMapByIds 带缓存/DB 新旧复活防护且缓存 RUNNING+SCHEDULED;
+ * Withdraw 的 loadTaskMapByIds 先按 {@code limit(50)} 归一化任务 id(本地先归一化再传入即可);
+ * Brand/AppearancePatent/CollectData/DeleteBrand 等的锁方法带自定义 TTL、等待或日志语义。
+ *
+ *
依赖仅限 task 模块内部(mapper/entity/锁服务)与 config 包(TaskPressureProperties),
+ * 不触碰任何业务模块,符合 ArchUnit 边界(task→业务 依赖保持为 0)。
+ */
+@Slf4j
+public final class TaskFinalizeSupport {
+
+ private TaskFinalizeSupport() {
+ }
+
+ // ------------------------------------------------------------------
+ // 任务实体加载(执行前)
+ // ------------------------------------------------------------------
+
+ /** 标准变体:模块缓存命中即直接返回,否则读 DB 并按 moduleType 匹配回填缓存。 */
+ public static FileTaskEntity loadTaskForExecution(FileTaskMapper fileTaskMapper,
+ AbstractModuleTaskCacheService> cacheService,
+ String moduleType,
+ Long taskId) {
+ return loadTaskForExecution(fileTaskMapper, cacheService, moduleType, taskId, cached -> cached != null);
+ }
+
+ /**
+ * 带「缓存行可用性」判定的变体:缓存命中但 cachedUsable 判定不可用(如 requestJson 为空)
+ * 时继续走 DB。cachedUsable 收到的入参可能为 null。
+ */
+ public static FileTaskEntity loadTaskForExecution(FileTaskMapper fileTaskMapper,
+ AbstractModuleTaskCacheService> cacheService,
+ String moduleType,
+ Long taskId,
+ Predicate cachedUsable) {
+ Map cachedTasks = cacheService.getTaskCacheBatch(List.of(taskId));
+ FileTaskEntity cached = cachedTasks.get(taskId);
+ if (cachedUsable.test(cached)) {
+ return cached;
+ }
+ FileTaskEntity dbTask = fileTaskMapper.selectById(taskId);
+ if (dbTask != null && moduleType.equals(dbTask.getModuleType())) {
+ cacheService.saveTaskCache(dbTask);
+ }
+ return dbTask;
+ }
+
+ // ------------------------------------------------------------------
+ // 批量任务加载
+ // ------------------------------------------------------------------
+
+ /** 标准变体:归一化任务 id → 缓存批量查 → 缺失的按批读 DB(moduleType 匹配),RUNNING 行回填缓存。 */
+ public static Map loadTaskMapByIds(FileTaskMapper fileTaskMapper,
+ TaskPressureProperties taskPressureProperties,
+ AbstractModuleTaskCacheService> cacheService,
+ String moduleType,
+ List taskIds) {
+ Map result = new LinkedHashMap<>();
+ List normalizedTaskIds = taskIds == null ? List.of() : taskIds.stream()
+ .filter(taskId -> taskId != null && taskId > 0)
+ .distinct()
+ .toList();
+ if (normalizedTaskIds.isEmpty()) {
+ return result;
+ }
+ Map cachedTasks = cacheService.getTaskCacheBatch(normalizedTaskIds);
+ result.putAll(cachedTasks);
+ List missingTaskIds = normalizedTaskIds.stream()
+ .filter(taskId -> !cachedTasks.containsKey(taskId))
+ .toList();
+ for (FileTaskEntity dbTask : selectTasksByIdsInBatches(fileTaskMapper, taskPressureProperties, missingTaskIds)) {
+ if (dbTask == null || !moduleType.equals(dbTask.getModuleType())) {
+ continue;
+ }
+ result.put(dbTask.getId(), dbTask);
+ if ("RUNNING".equals(dbTask.getStatus())) {
+ cacheService.saveTaskCache(dbTask);
+ }
+ }
+ return result;
+ }
+
+ /** 按任务压力配置的批量大小分批 selectBatchIds(各模块历史实现逐行一致)。 */
+ public static List selectTasksByIdsInBatches(FileTaskMapper fileTaskMapper,
+ TaskPressureProperties taskPressureProperties,
+ List taskIds) {
+ List tasks = new ArrayList<>();
+ if (taskIds == null || taskIds.isEmpty()) {
+ return tasks;
+ }
+ int batchSize = Math.max(1, taskPressureProperties.getDbSelectBatchSize());
+ for (int start = 0; start < taskIds.size(); start += batchSize) {
+ int end = Math.min(start + batchSize, taskIds.size());
+ tasks.addAll(fileTaskMapper.selectBatchIds(taskIds.subList(start, end)));
+ }
+ return tasks;
+ }
+
+ // ------------------------------------------------------------------
+ // 结果行失败落库
+ // ------------------------------------------------------------------
+
+ /**
+ * 结果行置为失败并清空文件字段后落库(success=0、rowSize=0、文件名/URL/ContentType 置空)。
+ * errorMessage 原样写入;历史上先把空串归一化为 null 的模块(PatrolDelete/ShopDataCrawl/
+ * QueryAsin/Withdraw)在调用前自行 {@code blankToNull(message)},保持原行为。
+ */
+ public static void markResultFailed(FileResultMapper fileResultMapper, FileResultEntity row, String message) {
+ row.setSuccess(0);
+ row.setErrorMessage(message);
+ row.setResultFilename(null);
+ row.setResultFileUrl(null);
+ row.setResultFileSize(0L);
+ row.setRowCount(0);
+ row.setResultContentType(null);
+ fileResultMapper.updateById(row);
+ }
+
+ // ------------------------------------------------------------------
+ // 任务分布式锁
+ // ------------------------------------------------------------------
+
+ /** 标准变体:taskId 非法返回 null;否则按模块标识获取锁(默认等待时长)。 */
+ public static TaskDistributedLockService.LockHandle acquireTaskLock(TaskDistributedLockService taskDistributedLockService,
+ String moduleType,
+ Long taskId) {
+ if (taskId == null || taskId <= 0) {
+ return null;
+ }
+ return taskDistributedLockService.acquire(moduleType, taskId);
+ }
+
+ /** 带 waitMillis 的变体(ShopDataCrawl 等使用)。 */
+ public static TaskDistributedLockService.LockHandle acquireTaskLock(TaskDistributedLockService taskDistributedLockService,
+ String moduleType,
+ Long taskId,
+ long waitMillis) {
+ if (taskId == null || taskId <= 0) {
+ return null;
+ }
+ return taskDistributedLockService.acquire(moduleType, taskId, waitMillis);
+ }
+
+ /**
+ * 锁竞争即拒绝提交并抛 TASK_BUSY(提交路径用)。logTag 传模块标签(如 {@code price-track}),
+ * 仅用于 warn 日志文案,不影响行为。
+ */
+ public static TaskDistributedLockService.LockHandle acquireTaskLockOrThrow(TaskDistributedLockService taskDistributedLockService,
+ String moduleType,
+ Long taskId,
+ String logTag) {
+ TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskDistributedLockService, moduleType, taskId);
+ if (lockHandle == null) {
+ log.warn("[{}] 任务锁竞争,拒绝本次提交 taskId={}", logTag, taskId);
+ throw new BusinessException(BusinessCodes.TASK_BUSY, "任务正在处理中,请稍后再试");
+ }
+ return lockHandle;
+ }
+}
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java
index 22a1be90f..86dd51fdb 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawExcelAssemblyService.java
@@ -1,18 +1,16 @@
package com.nanri.aiimage.modules.withdraw.service;
import com.nanri.aiimage.common.exception.BusinessException;
+import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
import com.nanri.aiimage.modules.withdraw.model.dto.WithdrawRowDto;
import com.nanri.aiimage.modules.withdraw.model.enums.WithdrawStatus;
import com.nanri.aiimage.modules.withdraw.model.vo.WithdrawResultItemVo;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.Cell;
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.math.BigDecimal;
import java.util.List;
import java.util.Map;
@@ -35,11 +33,11 @@ public class WithdrawExcelAssemblyService {
);
public void writeWorkbook(File outputXlsx, List items) {
- SXSSFWorkbook workbook = new SXSSFWorkbook(200);
- workbook.setCompressTempFiles(true);
- try (FileOutputStream outputStream = new FileOutputStream(outputXlsx)) {
- Sheet sheet = workbook.createSheet("Sheet1");
- writeHeader(sheet);
+ try (SxssfWorkbookWriter writer = SxssfWorkbookWriter.open()) {
+ Sheet sheet = writer.createSheet("Sheet1", HEADER, null);
+ for (int columnIndex = 0; columnIndex < HEADER.length; columnIndex++) {
+ sheet.setColumnWidth(columnIndex, SxssfWorkbookWriter.width(columnIndex == 0 ? 24 : 18));
+ }
BigDecimal totalShopAmount = totalShopAmount(items);
BigDecimal totalWithdrawAmount = totalWithdrawAmount(items);
@@ -52,7 +50,7 @@ public class WithdrawExcelAssemblyService {
List rows = item.getRows() == null ? List.of() : item.getRows();
if (rows.isEmpty()) {
Row row = sheet.createRow(rowIndex++);
- row.createCell(0).setCellValue(safe(item.getShopName()));
+ SxssfWorkbookWriter.setText(row, 0, safe(item.getShopName()));
if (!totalsWritten) {
writeTotals(row, totalShopAmount, totalWithdrawAmount);
totalsWritten = true;
@@ -61,15 +59,15 @@ public class WithdrawExcelAssemblyService {
for (int i = 0; i < rows.size(); i++) {
WithdrawRowDto data = rows.get(i);
Row row = sheet.createRow(rowIndex++);
- row.createCell(0).setCellValue(i == 0 ? safe(item.getShopName()) : "");
- row.createCell(1).setCellValue(formatCountry(data == null ? null : data.getCountry()));
- writeMoney(row.createCell(2), data == null ? null : data.getShopAmount());
+ SxssfWorkbookWriter.setText(row, 0, i == 0 ? safe(item.getShopName()) : "");
+ SxssfWorkbookWriter.setText(row, 1, formatCountry(data == null ? null : data.getCountry()));
+ SxssfWorkbookWriter.setNumber(row, 2, data == null ? null : data.getShopAmount());
if (!isNegativeWithdraw(data)) {
- writeMoney(row.createCell(3), data == null ? null : data.getWithdrawAmount());
+ SxssfWorkbookWriter.setNumber(row, 3, data == null ? null : data.getWithdrawAmount());
} else {
- row.createCell(3).setCellValue("");
+ SxssfWorkbookWriter.setText(row, 3, "");
}
- row.createCell(4).setCellValue(formatStatus(data));
+ SxssfWorkbookWriter.setText(row, 4, formatStatus(data));
if (!totalsWritten) {
writeTotals(row, totalShopAmount, totalWithdrawAmount);
totalsWritten = true;
@@ -78,20 +76,14 @@ public class WithdrawExcelAssemblyService {
}
Row subtotal = sheet.createRow(rowIndex++);
- writeMoney(subtotal.createCell(2), shopSubtotal(rows));
- writeMoney(subtotal.createCell(3), withdrawSubtotal(rows));
+ SxssfWorkbookWriter.setNumber(subtotal, 2, shopSubtotal(rows));
+ SxssfWorkbookWriter.setNumber(subtotal, 3, withdrawSubtotal(rows));
rowIndex++;
}
- workbook.write(outputStream);
+ writer.write(outputXlsx);
} catch (Exception ex) {
log.warn("[withdraw] write workbook failed: {}", ex.getMessage());
throw new BusinessException("生成取款 Excel 失败: " + ex.getMessage());
- } finally {
- try {
- workbook.close();
- } catch (Exception ignored) {
- }
- workbook.dispose();
}
}
@@ -107,17 +99,9 @@ public class WithdrawExcelAssemblyService {
return count;
}
- private void writeHeader(Sheet sheet) {
- Row headerRow = sheet.createRow(0);
- for (int columnIndex = 0; columnIndex < HEADER.length; columnIndex++) {
- headerRow.createCell(columnIndex).setCellValue(HEADER[columnIndex]);
- sheet.setColumnWidth(columnIndex, (columnIndex == 0 ? 24 : 18) * 256);
- }
- }
-
private void writeTotals(Row row, BigDecimal totalShopAmount, BigDecimal totalWithdrawAmount) {
- writeMoney(row.createCell(6), totalShopAmount);
- writeMoney(row.createCell(7), totalWithdrawAmount);
+ SxssfWorkbookWriter.setNumber(row, 6, totalShopAmount);
+ SxssfWorkbookWriter.setNumber(row, 7, totalWithdrawAmount);
}
private BigDecimal totalShopAmount(List items) {
@@ -186,14 +170,6 @@ public class WithdrawExcelAssemblyService {
return COUNTRY_NAMES.getOrDefault(value.toUpperCase(), value);
}
- private void writeMoney(Cell cell, BigDecimal value) {
- if (value == null) {
- cell.setCellValue("");
- return;
- }
- cell.setCellValue(value.doubleValue());
- }
-
private String safe(String value) {
return value == null ? "" : value;
}
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawTaskService.java
index eba21d40e..4db7ff933 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawTaskService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/withdraw/service/WithdrawTaskService.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.nanri.aiimage.common.exception.BusinessCodes;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.config.TaskPressureProperties;
@@ -19,6 +18,7 @@ import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
+import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
import com.nanri.aiimage.modules.withdraw.model.dto.WithdrawCreateTaskRequest;
@@ -529,49 +529,16 @@ public class WithdrawTaskService {
}
private FileTaskEntity loadTaskForExecution(Long taskId) {
- Map cachedTasks = taskCacheService.getTaskCacheBatch(List.of(taskId));
- FileTaskEntity cached = cachedTasks.get(taskId);
- if (cached != null) {
- return cached;
- }
- FileTaskEntity dbTask = fileTaskMapper.selectById(taskId);
- if (dbTask != null && MODULE_TYPE.equals(dbTask.getModuleType())) {
- taskCacheService.saveTaskCache(dbTask);
- }
- return dbTask;
+ return TaskFinalizeSupport.loadTaskForExecution(fileTaskMapper, taskCacheService, MODULE_TYPE, taskId);
}
private Map loadTaskMapByIds(List taskIds) {
- Map result = new LinkedHashMap<>();
- List normalizedTaskIds = normalizeTaskIds(taskIds);
- if (normalizedTaskIds.isEmpty()) {
- return result;
- }
- Map cachedTasks = taskCacheService.getTaskCacheBatch(normalizedTaskIds);
- result.putAll(cachedTasks);
- List missingTaskIds = normalizedTaskIds.stream().filter(taskId -> !cachedTasks.containsKey(taskId)).toList();
- for (FileTaskEntity dbTask : selectTasksByIdsInBatches(missingTaskIds)) {
- if (dbTask != null && MODULE_TYPE.equals(dbTask.getModuleType())) {
- result.put(dbTask.getId(), dbTask);
- if ("RUNNING".equals(dbTask.getStatus())) {
- taskCacheService.saveTaskCache(dbTask);
- }
- }
- }
- return result;
+ // Withdraw 特有:任务 id 归一化带 limit(50) 上限,保留在本地后传入公共加载
+ return TaskFinalizeSupport.loadTaskMapByIds(fileTaskMapper, taskPressureProperties, taskCacheService, MODULE_TYPE, normalizeTaskIds(taskIds));
}
private List selectTasksByIdsInBatches(List taskIds) {
- List tasks = new ArrayList<>();
- if (taskIds == null || taskIds.isEmpty()) {
- return tasks;
- }
- int batchSize = Math.max(1, taskPressureProperties.getDbSelectBatchSize());
- for (int start = 0; start < taskIds.size(); start += batchSize) {
- int end = Math.min(start + batchSize, taskIds.size());
- tasks.addAll(fileTaskMapper.selectBatchIds(taskIds.subList(start, end)));
- }
- return tasks;
+ return TaskFinalizeSupport.selectTasksByIdsInBatches(fileTaskMapper, taskPressureProperties, taskIds);
}
private Map loadHistoryTaskMap(List entities) {
@@ -1013,14 +980,7 @@ public class WithdrawTaskService {
}
private void markResultFailed(FileResultEntity row, String message) {
- row.setSuccess(RESULT_FAILED);
- row.setErrorMessage(blankToNull(message));
- row.setResultFilename(null);
- row.setResultFileUrl(null);
- row.setResultFileSize(0L);
- row.setResultContentType(null);
- row.setRowCount(0);
- fileResultMapper.updateById(row);
+ TaskFinalizeSupport.markResultFailed(fileResultMapper, row, blankToNull(message));
}
private boolean isResultFinished(FileResultEntity row) {
@@ -1055,19 +1015,11 @@ public class WithdrawTaskService {
}
private TaskDistributedLockService.LockHandle acquireTaskLockOrThrow(Long taskId) {
- TaskDistributedLockService.LockHandle lockHandle = acquireTaskLock(taskId);
- if (lockHandle == null) {
- log.warn("[withdraw] 任务锁竞争,拒绝本次提交 taskId={}", taskId);
- throw new BusinessException(BusinessCodes.TASK_BUSY, "任务正在处理中,请稍后再试");
- }
- return lockHandle;
+ return TaskFinalizeSupport.acquireTaskLockOrThrow(taskDistributedLockService, MODULE_TYPE, taskId, "withdraw");
}
private TaskDistributedLockService.LockHandle acquireTaskLock(Long taskId) {
- if (taskId == null || taskId <= 0) {
- return null;
- }
- return taskDistributedLockService.acquire(MODULE_TYPE, taskId);
+ return TaskFinalizeSupport.acquireTaskLock(taskDistributedLockService, MODULE_TYPE, taskId);
}
/**
diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue
index c79acf6b4..746463310 100644
--- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue
+++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue
@@ -5,17 +5,12 @@