fix(release): AP 部分缺口出表、平台自费计次与工作台预签名 TTL
- AP 抓取缺行不再一律判死,按覆盖率判定;≥95% 出表成功并保留缺口提示 - 无归属代理提取记 0 号平台自费桶,后台可见并推管理员日告警 - 工作台安装包预签名从 180s 提到可配置 3600s,避免慢网上传在途过期
This commit is contained in:
+56
-7
@@ -212,7 +212,13 @@ public class AppearancePatentResultJobSupport {
|
||||
}
|
||||
}
|
||||
}
|
||||
boolean failed = finalError != null && !finalError.isBlank();
|
||||
// 抓取缺行是“部分数据缺口”,不是致命失败:只要已有可用结果记录、且错误里没有
|
||||
// 出表/任务级故障,就先进入组装;最终是否成功由 completeLlmFileJob 按覆盖率判定。
|
||||
// 只有真正凑不出结果(result == null)时才维持 FAILED。
|
||||
boolean hasError = finalError != null && !finalError.isBlank();
|
||||
boolean partialGapSalvageable = hasError && isPartialDataGapError(finalError)
|
||||
&& assembleWorkbook && result != null;
|
||||
boolean failed = hasError && !partialGapSalvageable;
|
||||
boolean waitingForAssemble = !failed && assembleWorkbook && !shouldAssembleSynchronously();
|
||||
task.setStatus(statusResolver.resolve(waitingForAssemble, failed));
|
||||
task.setSuccessFileCount(failed ? 0 : 1);
|
||||
@@ -375,13 +381,16 @@ public class AppearancePatentResultJobSupport {
|
||||
AppearancePatentRowOutcome.Facts deliveryFacts = assembleResultWorkbook(task, result);
|
||||
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits - 1, "正在上传结果文件");
|
||||
fileResultMapper.updateById(result);
|
||||
boolean taskAlreadyFailed = STATUS_FAILED.equals(task.getStatus())
|
||||
|| (task.getErrorMessage() != null && !task.getErrorMessage().isBlank());
|
||||
String existingError = task.getErrorMessage();
|
||||
task.setStatus(statusResolver.resolve(false, taskAlreadyFailed));
|
||||
task.setSuccessFileCount(taskAlreadyFailed ? 0 : 1);
|
||||
task.setFailedFileCount(taskAlreadyFailed ? 1 : 0);
|
||||
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(taskAlreadyFailed ? existingError : null, deliveryFacts));
|
||||
boolean taskAlreadyFailed = STATUS_FAILED.equals(task.getStatus());
|
||||
boolean failed = shouldFailAfterAssembly(taskAlreadyFailed, existingError,
|
||||
deliveryFacts.expectedRows(), deliveryFacts.coverage(),
|
||||
properties.getLlmCoverageMinRatio());
|
||||
task.setStatus(statusResolver.resolve(false, failed));
|
||||
task.setSuccessFileCount(failed ? 0 : 1);
|
||||
task.setFailedFileCount(failed ? 1 : 0);
|
||||
// 成功时也保留缺口文案:用户要看到“N 行抓取失败”,但不能因此把整单判死、逼他重跑。
|
||||
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(existingError, deliveryFacts));
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
task.setFinishedAt(LocalDateTime.now());
|
||||
fileTaskMapper.updateById(task);
|
||||
@@ -390,6 +399,46 @@ public class AppearancePatentResultJobSupport {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 出表后的最终状态判定:已判死 / 覆盖率低于下限 / 非部分缺口的错误 → FAILED。
|
||||
*
|
||||
* <p>抓取缺行只允许把缺口写进消息,不允许把已经拿到 95% 以上结论的任务整单判死——
|
||||
* 那会让用户重跑,二次烧掉整单 LLM 密钥(现网 32288/32252 就是 3/2 行缺口烧掉整单)。
|
||||
*/
|
||||
static boolean shouldFailAfterAssembly(boolean taskAlreadyFailed, String existingError,
|
||||
int expectedRows, double coverage, double minCoverage) {
|
||||
if (taskAlreadyFailed) {
|
||||
return true;
|
||||
}
|
||||
boolean hasError = existingError != null && !existingError.isBlank();
|
||||
if (hasError && !isPartialDataGapError(existingError)) {
|
||||
return true;
|
||||
}
|
||||
if (expectedRows <= 0) {
|
||||
return hasError;
|
||||
}
|
||||
return coverage + 1e-9 < minCoverage;
|
||||
}
|
||||
|
||||
/**
|
||||
* 只认“少量行抓取/采集缺失”这类可带缺口交付的错误;出表失败、任务级故障仍按致命处理。
|
||||
*/
|
||||
static boolean isPartialDataGapError(String error) {
|
||||
if (error == null || error.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
if (error.contains("结果文件生成失败")
|
||||
|| error.contains("结果文件生成多次失败")
|
||||
|| error.contains("Generate appearance patent result failed")
|
||||
|| error.contains("任务不存在")
|
||||
|| error.contains("任务已自动结束")) {
|
||||
return false;
|
||||
}
|
||||
return error.contains("行抓取失败(未取得商品页数据)")
|
||||
|| error.contains("行未采集到数据")
|
||||
|| error.contains("行未完成检测");
|
||||
}
|
||||
|
||||
/**
|
||||
* 失败兜底:组装作业重试耗尽(WAIT_LLM 停放被 stuck 棘轮判死、或组装异常连吃 5 次重试)后调用,
|
||||
* 用已回传的分片与已拿到结论的行尽力生成可下载的部分结果文件。
|
||||
|
||||
Reference in New Issue
Block a user