fix(任务终态): 店铺级部分失败不再静默SUCCESS——四模块按失败原因如实标FAILED
- ProductRiskTaskService: 新增结果组装守卫(isResultAwaitingFileAssembly),部分店铺失败→FAILED; 补ProductRiskTaskServiceTest - PriceTrackTaskService: 部分店铺失败→FAILED - DeleteBrandRunService: failedCount>0→FAILED(不再"有成功就算成功"),预览行与计数反映组装终态 - ShopMatchTaskService: 同模式
This commit is contained in:
+23
-10
@@ -1634,16 +1634,19 @@ public class DeleteBrandRunService {
|
||||
return;
|
||||
}
|
||||
|
||||
task.setStatus(successCount > 0 ? "SUCCESS" : "FAILED");
|
||||
// 有失败文件 → FAILED(2026-09-30 修:此前「有成功就算成功」,文件生成失败被洗白)
|
||||
task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS");
|
||||
task.setSuccessFileCount(successCount);
|
||||
task.setFailedFileCount(failedCount);
|
||||
task.setErrorMessage(successCount > 0 ? null : "任务中间数据缺失,已按结果行状态自动收尾");
|
||||
task.setErrorMessage(failedCount > 0
|
||||
? (successCount > 0 ? "部分结果文件生成失败,已按结果行状态自动收尾" : "任务中间数据缺失,已按结果行状态自动收尾")
|
||||
: null);
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
fileTaskMapper.updateById(task);
|
||||
deleteBrandTaskCacheService.saveTaskCache(task);
|
||||
deleteBrandTaskCacheService.saveProgress(task.getId(), Map.of(
|
||||
"phase", successCount > 0 ? "success" : DeleteBrandTaskCacheService.PHASE_FAILED,
|
||||
"phase", failedCount > 0 ? DeleteBrandTaskCacheService.PHASE_FAILED : "success",
|
||||
"finished_files", String.valueOf(successCount),
|
||||
"updated_at", String.valueOf(System.currentTimeMillis())
|
||||
), true);
|
||||
@@ -1735,6 +1738,7 @@ public class DeleteBrandRunService {
|
||||
}
|
||||
|
||||
int successCount = 0;
|
||||
int failedCount = 0;
|
||||
boolean waitingForAssemble = false;
|
||||
List<DeleteBrandResultItemVo> finalItems = new ArrayList<>();
|
||||
for (Map.Entry<String, DeleteBrandParsedFileCacheDto> entry : parsedPayload.entrySet()) {
|
||||
@@ -1806,28 +1810,37 @@ public class DeleteBrandRunService {
|
||||
item.setPlatform(parsedFile.getPlatform());
|
||||
item.setOpenStoreUrl(parsedFile.getOpenStoreUrl());
|
||||
item.setMatched(parsedFile.getShopId() != null && !parsedFile.getShopId().isBlank());
|
||||
item.setSuccess(true);
|
||||
item.setError(null);
|
||||
// 预览行与计数必须反映本文件组装终态:此前无条件按成功计,
|
||||
// 「结果文件生成失败」既进不了 failedFileCount 也显示为成功(2026-09-30 修)
|
||||
item.setSuccess(!assembleTerminallyFailed);
|
||||
item.setError(assembleTerminallyFailed ? "结果文件生成失败" : null);
|
||||
item.setMatchStatus(item.isMatched() ? ZiniaoShopIndexService.MATCH_STATUS_MATCHED : ZiniaoShopIndexService.MATCH_STATUS_PENDING);
|
||||
item.setMatchMessage(item.isMatched() ? null : "店铺索引信息缺失,请重新匹配索引");
|
||||
finalItems.add(item);
|
||||
successCount++;
|
||||
if (assembleTerminallyFailed) {
|
||||
failedCount++;
|
||||
} else {
|
||||
successCount++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!waitingForAssemble) {
|
||||
waitingForAssemble = taskFileJobService.countUnfinishedAssembleJobs(task.getId(), MODULE_TYPE) > 0L;
|
||||
}
|
||||
task.setStatus(waitingForAssemble ? "RUNNING" : "SUCCESS");
|
||||
// 有组装终态失败的文件 → 任务必须 FAILED(2026-09-30 修:此前无条件 SUCCESS
|
||||
// 且 successCount 无条件自增,failedFileCount 恒为 0,文件生成失败被吞)
|
||||
task.setStatus(waitingForAssemble ? "RUNNING" : (failedCount > 0 ? "FAILED" : "SUCCESS"));
|
||||
task.setSuccessFileCount(successCount);
|
||||
task.setFailedFileCount(Math.max(0, parsedPayload.size() - successCount));
|
||||
task.setErrorMessage(null);
|
||||
task.setFailedFileCount(failedCount);
|
||||
task.setErrorMessage(failedCount > 0 ? failedCount + " 个结果文件生成失败" : null);
|
||||
task.setResultJson(toCompactTaskResultJsonForDb(finalItems));
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(waitingForAssemble ? null : LocalDateTime.now());
|
||||
fileTaskMapper.updateById(task);
|
||||
deleteBrandTaskCacheService.saveTaskCache(task);
|
||||
deleteBrandTaskCacheService.saveProgress(task.getId(), Map.of(
|
||||
"phase", waitingForAssemble ? DeleteBrandTaskCacheService.PHASE_UPLOADING : "success",
|
||||
"phase", waitingForAssemble ? DeleteBrandTaskCacheService.PHASE_UPLOADING
|
||||
: (failedCount > 0 ? DeleteBrandTaskCacheService.PHASE_FAILED : "success"),
|
||||
"file_index", String.valueOf(parsedPayload.size()),
|
||||
"file_total", String.valueOf(parsedPayload.size()),
|
||||
"finished_files", String.valueOf(successCount),
|
||||
|
||||
+4
-1
@@ -2249,7 +2249,10 @@ public class PriceTrackTaskService {
|
||||
task.setErrorMessage(null);
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else if (ok > 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
// 部分店铺失败也必须是 FAILED(2026-09-30 修:此前标 SUCCESS 只把原因挂在
|
||||
// errorMessage,前端按成功展示、用户以为全跑完了;失败行的"部分结果"文件
|
||||
// 由上面的组装守卫确保已落地,标失败不影响下载)
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join("; ", allErrors));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else {
|
||||
|
||||
+32
-2
@@ -404,12 +404,28 @@ public class ProductRiskTaskService {
|
||||
int fail = 0;
|
||||
List<String> allErrors = new ArrayList<>();
|
||||
boolean allDone = true;
|
||||
Map<Long, TaskFileJobEntity> jobMap = taskFileJobService.findAssembleJobsByResultIds(
|
||||
MODULE_TYPE,
|
||||
latest.stream()
|
||||
.map(FileResultEntity::getId)
|
||||
.filter(id -> id != null && id > 0)
|
||||
.toList());
|
||||
for (FileResultEntity fr : latest) {
|
||||
boolean success = fr.getSuccess() != null && fr.getSuccess() == 1;
|
||||
boolean failed = fr.getErrorMessage() != null && !fr.getErrorMessage().isBlank();
|
||||
if (success) {
|
||||
// 与 updateTaskStatusFromLatestRows 同一口径:结果文件尚在组装的行不算已完成,
|
||||
// 否则删一条行触发重算时会把任务提前终态,前端停轮询、下载按钮不出现
|
||||
if (isResultAwaitingFileAssembly(fr, jobMap.get(fr.getId()))) {
|
||||
allDone = false;
|
||||
continue;
|
||||
}
|
||||
ok++;
|
||||
} else if (failed) {
|
||||
if (isResultAwaitingFileAssembly(fr, jobMap.get(fr.getId()))) {
|
||||
allDone = false;
|
||||
continue;
|
||||
}
|
||||
fail++;
|
||||
allErrors.add(fr.getSourceFilename() + ": " + fr.getErrorMessage());
|
||||
} else {
|
||||
@@ -432,7 +448,10 @@ public class ProductRiskTaskService {
|
||||
task.setErrorMessage(null);
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else if (ok > 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
// 与 updateTaskStatusFromLatestRows 同一口径:部分店铺失败 = 结果不完整,
|
||||
// 如实标 FAILED(失败店铺的部分结果文件仍可下载)。若这里保持 SUCCESS,
|
||||
// 删一条无关键结果行就会把已判 FAILED 的部分失败任务翻回「成功」
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join("; ", allErrors));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else {
|
||||
@@ -1003,6 +1022,13 @@ public class ProductRiskTaskService {
|
||||
}
|
||||
ok++;
|
||||
} else if (failed) {
|
||||
// 失败店铺的「部分结果」文件可能仍在组装:文件落地前不能让任务提前终态,
|
||||
// 否则前端停止轮询、下载按钮永远不出现(失败任务的部分结果同样要能下载;
|
||||
// 对齐 PriceTrackTaskService 的同一守卫)
|
||||
if (isResultAwaitingFileAssembly(fr, jobMap.get(fr.getId()))) {
|
||||
allDone = false;
|
||||
continue;
|
||||
}
|
||||
fail++;
|
||||
allErrors.add(fr.getSourceFilename() + ": " + fr.getErrorMessage());
|
||||
} else {
|
||||
@@ -1023,7 +1049,11 @@ public class ProductRiskTaskService {
|
||||
task.setErrorMessage(null);
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else if (ok > 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
// 部分店铺失败 = 结果不完整,如实标 FAILED 并写明原因(失败店铺已跑出来的行
|
||||
// 会组装成「部分结果」文件,仍可下载)。原实现标 SUCCESS,让「审批里国家
|
||||
// 搜索失败被跳过」这类事故在任务列表里全绿:2026-09-30 生产 25 条全 SUCCESS
|
||||
// 即此类;语义与跟价 4.0.26「任务没跑完如实报失败」一致
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join("; ", allErrors.isEmpty() ? batchErrors : allErrors));
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
} else {
|
||||
|
||||
+10
-1
@@ -976,6 +976,12 @@ public class ShopMatchTaskService {
|
||||
}
|
||||
ok++;
|
||||
} else if (failed) {
|
||||
// 失败行也可能正在组装"部分结果"文件:文件没落地前不能让任务提前终态,
|
||||
// 否则前端一停轮询,下载按钮永远不出现(失败任务的结果文件同样要能下载)
|
||||
if (isResultAwaitingFileAssembly(row, jobMap.get(row.getId()))) {
|
||||
allDone = false;
|
||||
continue;
|
||||
}
|
||||
fail++;
|
||||
errors.add(row.getSourceFilename() + ": " + row.getErrorMessage());
|
||||
} else {
|
||||
@@ -998,7 +1004,10 @@ public class ShopMatchTaskService {
|
||||
task.setErrorMessage(null);
|
||||
task.setFinishedAt(now());
|
||||
} else if (ok > 0) {
|
||||
task.setStatus("SUCCESS");
|
||||
// 部分店铺失败也必须是 FAILED(2026-09-30 修:此前标 SUCCESS 只把原因挂在
|
||||
// errorMessage,前端按成功展示;失败行的"部分结果"文件由上面的组装守卫
|
||||
// 确保已落地,标失败不影响下载)
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage(String.join(";", errors.isEmpty() ? batchErrors : errors));
|
||||
task.setFinishedAt(now());
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user