后台管理接口修复 后端BUG修复
This commit is contained in:
+79
-19
@@ -259,12 +259,18 @@ public class SimilarAsinCozeClient {
|
||||
}
|
||||
|
||||
private Map<String, Object> buildParameters(List<SimilarAsinResultRowDto> rows, String prompt, String apiKey) {
|
||||
List<String> groupKeys = rows.stream().map(row -> nonBlank(row.getGroupKey(), rowKey(row.getId(), row.getAsin(), row.getCountry()))).toList();
|
||||
List<String> rowTokens = rows.stream().map(row -> nonBlank(row.getRowToken(), "")).toList();
|
||||
List<String> rowIds = rows.stream().map(row -> nonBlank(row.getId(), "")).toList();
|
||||
List<String> asins = rows.stream().map(row -> nonBlank(row.getAsin(), "")).toList();
|
||||
List<String> countries = rows.stream().map(row -> nonBlank(row.getCountry(), "")).toList();
|
||||
List<String> skus = rows.stream().map(row -> nonBlank(row.getSku(), "")).toList();
|
||||
List<String> titles = rows.stream().map(row -> nonBlank(row.getTitle(), row.getAsin())).toList();
|
||||
List<String> urls = rows.stream().map(row -> nonBlank(row.getUrl(), "")).toList();
|
||||
List<List<String>> urlLists = rows.stream().map(SimilarAsinResultRowDto::getUrls).toList();
|
||||
|
||||
Map<String, Object> parameters = new LinkedHashMap<>();
|
||||
parameters.put("items", buildItemObjects(rows, asins, urls, urlLists));
|
||||
parameters.put("items", buildItemObjects(groupKeys, rowTokens, rowIds, asins, countries, skus, titles, urls, urlLists));
|
||||
parameters.put("prompt", prompt == null ? "" : prompt);
|
||||
if (apiKey != null && !apiKey.isBlank()) {
|
||||
parameters.put("api_key", apiKey.trim());
|
||||
@@ -302,14 +308,25 @@ public class SimilarAsinCozeClient {
|
||||
return normalized.substring(0, 6) + "***" + normalized.substring(normalized.length() - 4);
|
||||
}
|
||||
|
||||
private List<Map<String, Object>> buildItemObjects(List<SimilarAsinResultRowDto> rows,
|
||||
private List<Map<String, Object>> buildItemObjects(List<String> groupKeys,
|
||||
List<String> rowTokens,
|
||||
List<String> rowIds,
|
||||
List<String> asins,
|
||||
List<String> countries,
|
||||
List<String> skus,
|
||||
List<String> titles,
|
||||
List<String> urls,
|
||||
List<List<String>> urlLists) {
|
||||
List<Map<String, Object>> items = new ArrayList<>(rows.size());
|
||||
for (int i = 0; i < rows.size(); i++) {
|
||||
List<Map<String, Object>> items = new ArrayList<>(asins.size());
|
||||
for (int i = 0; i < asins.size(); i++) {
|
||||
Map<String, Object> item = new LinkedHashMap<>();
|
||||
item.put("group_key", groupKeys.get(i));
|
||||
item.put("row_token", rowTokens.get(i));
|
||||
item.put("row_id", rowIds.get(i));
|
||||
item.put("asin", asins.get(i));
|
||||
item.put("country", countries.get(i));
|
||||
item.put("sku", skus.get(i));
|
||||
item.put("title", titles.get(i));
|
||||
item.put("url", urls.get(i));
|
||||
item.put("target_urls", urlLists.get(i));
|
||||
items.add(item);
|
||||
@@ -334,6 +351,9 @@ public class SimilarAsinCozeClient {
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("group_key"), node.get("groupKey")),
|
||||
firstNonNull(itemNode.get("group_key"), itemNode.get("groupKey")))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("row_token"), node.get("rowToken")),
|
||||
firstNonNull(itemNode.get("row_token"), itemNode.get("rowToken")))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("row_id"), firstNonNull(node.get("rowId"), node.get("id"))),
|
||||
firstNonNull(itemNode.get("row_id"), firstNonNull(itemNode.get("rowId"), itemNode.get("id"))))),
|
||||
@@ -341,6 +361,9 @@ public class SimilarAsinCozeClient {
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("country"), node.get("site")),
|
||||
firstNonNull(itemNode.get("country"), itemNode.get("site")))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("sku"), firstNonNull(node.get("SKU"), firstNonNull(node.get("seller_sku"), node.get("sellerSku")))),
|
||||
firstNonNull(itemNode.get("sku"), firstNonNull(itemNode.get("SKU"), firstNonNull(itemNode.get("seller_sku"), itemNode.get("sellerSku")))))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("price"), node.get("价格")),
|
||||
firstNonNull(itemNode.get("price"), itemNode.get("价格")))),
|
||||
@@ -351,6 +374,15 @@ public class SimilarAsinCozeClient {
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("similarity"), firstNonNull(node.get("similarity_rate"), node.get("相似度"))),
|
||||
firstNonNull(itemNode.get("similarity"), firstNonNull(itemNode.get("similarity_rate"), itemNode.get("相似度"))))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("is_conform"), firstNonNull(node.get("isConform"), firstNonNull(node.get("conform"), node.get("是否符合类目")))),
|
||||
firstNonNull(itemNode.get("is_conform"), firstNonNull(itemNode.get("isConform"), firstNonNull(itemNode.get("conform"), itemNode.get("是否符合类目")))))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("reason"), firstNonNull(node.get("原因"), node.get("不符合理由"))),
|
||||
firstNonNull(itemNode.get("reason"), firstNonNull(itemNode.get("原因"), itemNode.get("不符合理由"))))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("category"), firstNonNull(node.get("类目"), node.get("产品类目"))),
|
||||
firstNonNull(itemNode.get("category"), firstNonNull(itemNode.get("类目"), itemNode.get("产品类目"))))),
|
||||
text(firstNonNull(node.get("appearance"),
|
||||
firstNonNull(node.get("appearance_risk"),
|
||||
firstNonNull(itemNode.get("appearance"), itemNode.get("appearance_risk"))))),
|
||||
@@ -360,6 +392,9 @@ public class SimilarAsinCozeClient {
|
||||
text(firstNonNull(node.get("result"),
|
||||
firstNonNull(node.get("conclusion"),
|
||||
firstNonNull(itemNode.get("result"), itemNode.get("conclusion"))))),
|
||||
text(firstNonNull(
|
||||
firstNonNull(node.get("status"), firstNonNull(node.get("row_status"), node.get("rowStatus"))),
|
||||
firstNonNull(itemNode.get("status"), firstNonNull(itemNode.get("row_status"), itemNode.get("rowStatus"))))),
|
||||
text(firstNonNull(node.get("title_reason"),
|
||||
firstNonNull(node.get("titleReason"),
|
||||
firstNonNull(itemNode.get("title_reason"), itemNode.get("titleReason"))))),
|
||||
@@ -391,15 +426,14 @@ public class SimilarAsinCozeClient {
|
||||
}
|
||||
|
||||
private List<SimilarAsinResultRowDto> mergeRows(List<SimilarAsinResultRowDto> rows, List<CozeResult> results) {
|
||||
Map<String, CozeResult> resultByGroupKey = new LinkedHashMap<>();
|
||||
Map<String, CozeResult> resultByRowToken = new LinkedHashMap<>();
|
||||
Map<String, CozeResult> resultByCompositeKey = new LinkedHashMap<>();
|
||||
Map<String, CozeResult> resultByAsinCountry = new LinkedHashMap<>();
|
||||
Map<String, CozeResult> resultByAsin = new LinkedHashMap<>();
|
||||
Map<String, CozeResult> resultByRowId = new LinkedHashMap<>();
|
||||
for (CozeResult result : results) {
|
||||
String groupKey = normalize(result.groupKey());
|
||||
if (!groupKey.isBlank()) {
|
||||
resultByGroupKey.putIfAbsent(groupKey, result);
|
||||
String rowToken = normalize(result.rowToken());
|
||||
if (!rowToken.isBlank()) {
|
||||
resultByRowToken.putIfAbsent(rowToken, result);
|
||||
}
|
||||
String compositeKey = rowKey(result.rowId(), result.asin(), result.country());
|
||||
if (!compositeKey.isBlank()) {
|
||||
@@ -409,10 +443,6 @@ public class SimilarAsinCozeClient {
|
||||
if (!asinCountryKey.isBlank()) {
|
||||
resultByAsinCountry.putIfAbsent(asinCountryKey, result);
|
||||
}
|
||||
String asinKey = normalize(result.asin()).toUpperCase(Locale.ROOT);
|
||||
if (!asinKey.isBlank()) {
|
||||
resultByAsin.putIfAbsent(asinKey, result);
|
||||
}
|
||||
String rowIdKey = normalize(result.rowId());
|
||||
if (!rowIdKey.isBlank()) {
|
||||
resultByRowId.putIfAbsent(rowIdKey, result);
|
||||
@@ -423,7 +453,7 @@ public class SimilarAsinCozeClient {
|
||||
boolean allowIndexFallback = results.size() == rows.size() && results.stream().noneMatch(this::hasIdentity);
|
||||
for (int i = 0; i < rows.size(); i++) {
|
||||
SimilarAsinResultRowDto row = copy(rows.get(i));
|
||||
CozeResult result = resultByGroupKey.get(normalize(row.getGroupKey()));
|
||||
CozeResult result = resultByRowToken.get(normalize(row.getRowToken()));
|
||||
if (result == null) {
|
||||
result = resultByCompositeKey.get(rowKey(row.getId(), row.getAsin(), row.getCountry()));
|
||||
}
|
||||
@@ -433,9 +463,6 @@ public class SimilarAsinCozeClient {
|
||||
if (result == null) {
|
||||
result = resultByAsinCountry.get(asinCountryKey(row.getAsin(), row.getCountry()));
|
||||
}
|
||||
if (result == null) {
|
||||
result = resultByAsin.get(normalize(row.getAsin()).toUpperCase(Locale.ROOT));
|
||||
}
|
||||
if (result == null) {
|
||||
result = resultByRowId.get(normalize(row.getId()));
|
||||
}
|
||||
@@ -460,7 +487,7 @@ public class SimilarAsinCozeClient {
|
||||
if (result == null) {
|
||||
return false;
|
||||
}
|
||||
return !normalize(result.groupKey()).isBlank()
|
||||
return !normalize(result.rowToken()).isBlank()
|
||||
|| !normalize(result.rowId()).isBlank()
|
||||
|| !normalize(result.asin()).isBlank();
|
||||
}
|
||||
@@ -469,7 +496,7 @@ public class SimilarAsinCozeClient {
|
||||
if (result == null || row == null) {
|
||||
return false;
|
||||
}
|
||||
if (!normalize(result.groupKey()).isBlank() || !normalize(result.rowId()).isBlank()) {
|
||||
if (!normalize(result.rowToken()).isBlank() || !normalize(result.rowId()).isBlank()) {
|
||||
return false;
|
||||
}
|
||||
String resultAsin = normalize(result.asin()).toUpperCase(Locale.ROOT);
|
||||
@@ -481,12 +508,17 @@ public class SimilarAsinCozeClient {
|
||||
return;
|
||||
}
|
||||
row.setTitleRisk(result.title());
|
||||
row.setSku(nonBlank(result.sku(), row.getSku()));
|
||||
row.setPrice(nonBlank(result.price(), row.getPrice()));
|
||||
row.setIsStock(result.isStock());
|
||||
row.setSimilarity(result.similarity());
|
||||
row.setIsConform(result.isConform());
|
||||
row.setReason(result.reason());
|
||||
row.setCategory(result.category());
|
||||
row.setAppearanceRisk(result.appearance());
|
||||
row.setPatentRisk(result.patent());
|
||||
row.setConclusion(result.result());
|
||||
row.setStatus(result.status());
|
||||
row.setTitleReason(result.titleReason());
|
||||
row.setAppearanceReason(result.appearanceReason());
|
||||
row.setPatentReason(result.patentReason());
|
||||
@@ -508,11 +540,16 @@ public class SimilarAsinCozeClient {
|
||||
row.setId(source.getId());
|
||||
row.setAsin(source.getAsin());
|
||||
row.setCountry(source.getCountry());
|
||||
row.setSku(source.getSku());
|
||||
row.setPrice(source.getPrice());
|
||||
row.setUrls(source.getUrls());
|
||||
row.setTitle(source.getTitle());
|
||||
row.setError(source.getError());
|
||||
row.setDone(source.getDone());
|
||||
row.setStatus(source.getStatus());
|
||||
row.setIsConform(source.getIsConform());
|
||||
row.setReason(source.getReason());
|
||||
row.setCategory(source.getCategory());
|
||||
row.setTitleRisk(source.getTitleRisk());
|
||||
row.setAppearanceRisk(source.getAppearanceRisk());
|
||||
row.setPatentRisk(source.getPatentRisk());
|
||||
@@ -532,6 +569,12 @@ public class SimilarAsinCozeClient {
|
||||
if (row.getError() == null || row.getError().isBlank()) {
|
||||
row.setError(failureMessage);
|
||||
}
|
||||
if (row.getReason() == null || row.getReason().isBlank()) {
|
||||
row.setReason(failureMessage);
|
||||
}
|
||||
if (row.getStatus() == null || row.getStatus().isBlank()) {
|
||||
row.setStatus("FAILED");
|
||||
}
|
||||
if (row.getTitleRisk() == null || row.getTitleRisk().isBlank()) {
|
||||
row.setTitleRisk(reviewMessage);
|
||||
}
|
||||
@@ -721,6 +764,17 @@ public class SimilarAsinCozeClient {
|
||||
|| item.has("similarity")
|
||||
|| item.has("similarity_rate")
|
||||
|| item.has("相似度")
|
||||
|| item.has("is_conform")
|
||||
|| item.has("isConform")
|
||||
|| item.has("conform")
|
||||
|| item.has("是否符合类目")
|
||||
|| item.has("reason")
|
||||
|| item.has("原因")
|
||||
|| item.has("不符合理由")
|
||||
|| item.has("category")
|
||||
|| item.has("类目")
|
||||
|| item.has("产品类目")
|
||||
|| item.has("status")
|
||||
|| item.has("title_reason")
|
||||
|| item.has("titleReason")
|
||||
|| item.has("appearance_reason")
|
||||
@@ -973,16 +1027,22 @@ public class SimilarAsinCozeClient {
|
||||
|
||||
private record CozeResult(
|
||||
String groupKey,
|
||||
String rowToken,
|
||||
String rowId,
|
||||
String asin,
|
||||
String country,
|
||||
String sku,
|
||||
String price,
|
||||
String title,
|
||||
String isStock,
|
||||
String similarity,
|
||||
String isConform,
|
||||
String reason,
|
||||
String category,
|
||||
String appearance,
|
||||
String patent,
|
||||
String result,
|
||||
String status,
|
||||
String titleReason,
|
||||
String appearanceReason,
|
||||
String patentReason
|
||||
|
||||
+1
-1
@@ -120,7 +120,7 @@ public class SimilarAsinController {
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/result")
|
||||
@Operation(summary = "提交 Python 回传结果", description = "Python 回传商品数据接口。items 可以是一条或多条;Java 先原样保存回传数据,再内部攒够 10 条调用 Coze。done=true 表示 Python 已完成全部回传,Java 会强制处理剩余不足 10 条的数据并生成最终 xlsx。")
|
||||
@Operation(summary = "提交 Python 回传结果", description = "Python 回传商品数据接口。请通过 groups[].items[] 回传分组结果;Java 先原样保存回传数据,再内部攒批调用 Coze。done=true 表示 Python 已完成全部回传,Java 会强制处理剩余未满批的数据并生成最终 xlsx。")
|
||||
public ApiResponse<Void> result(
|
||||
@Parameter(description = "相似ASIN检测任务 ID。任务必须处于 RUNNING 状态。", required = true, example = "3938")
|
||||
@PathVariable Long taskId,
|
||||
|
||||
+20
@@ -39,6 +39,10 @@ public class SimilarAsinResultRowDto {
|
||||
@Schema(description = "站点或国家。来自 Excel 的国家列,例如英国、德国、法国。", example = "英国")
|
||||
private String country;
|
||||
|
||||
@JsonAlias({"sku", "SKU", "seller_sku", "sellerSku", "msku", "货号"})
|
||||
@Schema(description = "商品 SKU。来自 Excel 解析或 Python 回传。", example = "SKU-001")
|
||||
private String sku;
|
||||
|
||||
@JsonAlias({"price", "价格"})
|
||||
@Schema(description = "商品价格。来自 Excel 解析或 Python 回传。", example = "12.29")
|
||||
private String price;
|
||||
@@ -61,12 +65,28 @@ public class SimilarAsinResultRowDto {
|
||||
@Schema(description = "Coze 返回的相似度结果。", example = "80%", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String similarity;
|
||||
|
||||
@JsonAlias({"is_conform", "isConform", "conform", "是否符合类目"})
|
||||
@Schema(description = "Coze 返回的是否符合类目结果。", example = "符合", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String isConform;
|
||||
|
||||
@JsonAlias({"reason", "原因", "不符合理由"})
|
||||
@Schema(description = "Coze 返回的不符合理由。", example = "类目不匹配", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String reason;
|
||||
|
||||
@JsonAlias({"category", "类目", "产品类目"})
|
||||
@Schema(description = "Coze 返回的产品类目。", example = "女装", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String category;
|
||||
|
||||
@Schema(description = "单行错误信息。通常用于记录 Python 单行处理异常;Coze 失败时后端会尽量保留原始行,不强行写入风险结果。", example = "图片地址为空")
|
||||
private String error;
|
||||
|
||||
@Schema(description = "单行完成标记。当前主要使用请求体顶层 done 控制任务收尾,该字段仅作兼容。", example = "true")
|
||||
private Boolean done;
|
||||
|
||||
@JsonAlias({"row_status", "rowStatus", "Status"})
|
||||
@Schema(description = "Coze row status", example = "success", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String status;
|
||||
|
||||
@Schema(description = "兼容旧版 Coze 返回中的标题维度结果字段;当前相似 ASIN 结果文件不再输出该列。", example = "标题未发现明显商标侵权风险。", accessMode = Schema.AccessMode.READ_ONLY)
|
||||
private String titleRisk;
|
||||
|
||||
|
||||
-2
@@ -27,6 +27,4 @@ public class SimilarAsinSubmitResultRequest {
|
||||
@Schema(description = "本次回传的分组结果列表,推荐优先使用")
|
||||
private List<SimilarAsinResultGroupDto> groups = new ArrayList<>();
|
||||
|
||||
@Schema(description = "兼容旧链路的平铺结果列表")
|
||||
private List<SimilarAsinResultRowDto> items = new ArrayList<>();
|
||||
}
|
||||
|
||||
+3
@@ -39,6 +39,9 @@ public class SimilarAsinParsedRowVo {
|
||||
@Schema(description = "商品价格。", example = "12.29")
|
||||
private String price;
|
||||
|
||||
@Schema(description = "商品 SKU。", example = "SKU-001")
|
||||
private String sku;
|
||||
|
||||
@Schema(description = "商品图片 URL 或商品 URL,供 Coze 检测使用。", example = "https://webstatic.aiproxy.vip/output/demo.jpg")
|
||||
private String url;
|
||||
|
||||
|
||||
+222
-149
@@ -114,11 +114,15 @@ public class SimilarAsinTaskService {
|
||||
private static final int PARSE_RESPONSE_PREVIEW_LIMIT = 100;
|
||||
private static final List<String> RESULT_HEADERS = List.of(
|
||||
"id",
|
||||
"sku",
|
||||
"asin",
|
||||
"国家",
|
||||
"价格",
|
||||
"是否有货",
|
||||
"相似度"
|
||||
"相似度",
|
||||
"是否符合类目",
|
||||
"不符合理由",
|
||||
"产品类目",
|
||||
"status"
|
||||
);
|
||||
|
||||
private final LocalFileStorageService localFileStorageService;
|
||||
@@ -316,8 +320,8 @@ public class SimilarAsinTaskService {
|
||||
vo.setDroppedRows(droppedRows);
|
||||
vo.setGroupCount(groups.size());
|
||||
vo.setAiPrompt(normalize(request.getAiPrompt()));
|
||||
vo.setItems(buildResponsePreviewRows(allRows));
|
||||
vo.setGroups(List.of());
|
||||
vo.setItems(new ArrayList<>(allRows));
|
||||
vo.setGroups(groups);
|
||||
long finishedAt = System.nanoTime();
|
||||
log.info("[similar-asin] parse timing taskId={} files={} rows={} groups={} totalMs={} parseMs={} groupMs={} taskInsertMs={} payloadJsonMs={} payloadStoreMs={} persistMs={} responseMs={}",
|
||||
task.getId(),
|
||||
@@ -482,7 +486,7 @@ public class SimilarAsinTaskService {
|
||||
completeSubmittedChunk(context);
|
||||
return null;
|
||||
});
|
||||
submitCozeForSubmittedChunk(context);
|
||||
scheduleCozePipelineForSubmittedChunk(context);
|
||||
return;
|
||||
}
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
@@ -568,7 +572,7 @@ public class SimilarAsinTaskService {
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
fileTaskMapper.updateById(task);
|
||||
}
|
||||
submitCozeForSubmittedChunk(context);
|
||||
scheduleCozePipelineForSubmittedChunk(context);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@@ -620,19 +624,11 @@ public class SimilarAsinTaskService {
|
||||
if (transactionManager != null) {
|
||||
LocalDateTime threshold = LocalDateTime.now().minusMinutes(Math.max(1, properties.getStaleTimeoutMinutes()));
|
||||
long thresholdMillis = threshold.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
|
||||
List<FileTaskEntity> tasks = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
|
||||
.lt(FileTaskEntity::getUpdatedAt, threshold)
|
||||
.last("limit 50"));
|
||||
List<FileTaskEntity> tasks = listStaleFinalizeCandidates(threshold);
|
||||
for (FileTaskEntity task : tasks) {
|
||||
if (!isOwnerCurrent(ownerFromTask(task))) {
|
||||
continue;
|
||||
}
|
||||
if (isJavaSideProcessing(task.getId())) {
|
||||
touchJavaSideTaskActivity(task.getId());
|
||||
continue;
|
||||
}
|
||||
long heartbeatMillis = taskCacheService.getTaskHeartbeatMillis(task.getId());
|
||||
if (heartbeatMillis > thresholdMillis) {
|
||||
continue;
|
||||
@@ -652,19 +648,11 @@ public class SimilarAsinTaskService {
|
||||
}
|
||||
LocalDateTime threshold = LocalDateTime.now().minusMinutes(Math.max(1, properties.getStaleTimeoutMinutes()));
|
||||
long thresholdMillis = threshold.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
|
||||
List<FileTaskEntity> tasks = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
|
||||
.lt(FileTaskEntity::getUpdatedAt, threshold)
|
||||
.last("limit 50"));
|
||||
List<FileTaskEntity> tasks = listStaleFinalizeCandidates(threshold);
|
||||
for (FileTaskEntity task : tasks) {
|
||||
if (!isOwnerCurrent(ownerFromTask(task))) {
|
||||
continue;
|
||||
}
|
||||
if (isJavaSideProcessing(task.getId())) {
|
||||
touchJavaSideTaskActivity(task.getId());
|
||||
continue;
|
||||
}
|
||||
long heartbeatMillis = taskCacheService.getTaskHeartbeatMillis(task.getId());
|
||||
if (heartbeatMillis > thresholdMillis) {
|
||||
continue;
|
||||
@@ -674,11 +662,46 @@ public class SimilarAsinTaskService {
|
||||
continue;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
finalizeTask(task, "Python interrupted before uploading final similar ASIN result", allRowCount(task), true);
|
||||
finalizeStaleTask(task.getId(), "Python interrupted before uploading final similar ASIN result");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void debugFinalizeStaleTask(Long taskId) {
|
||||
if (taskId == null || taskId <= 0) {
|
||||
return;
|
||||
}
|
||||
if (transactionManager != null) {
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = acquireTaskLock(taskId, 0L);
|
||||
if (taskLockHandle == null) {
|
||||
return;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
inNewTransaction(() -> {
|
||||
finalizeStaleTask(taskId, "Python interrupted before uploading final similar ASIN result");
|
||||
return null;
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = acquireTaskLock(taskId, 0L);
|
||||
if (taskLockHandle == null) {
|
||||
return;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
finalizeStaleTask(taskId, "Python interrupted before uploading final similar ASIN result");
|
||||
}
|
||||
}
|
||||
|
||||
private List<FileTaskEntity> listStaleFinalizeCandidates(LocalDateTime threshold) {
|
||||
return fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(FileTaskEntity::getStatus, STATUS_RUNNING)
|
||||
.lt(FileTaskEntity::getCreatedAt, threshold)
|
||||
.orderByAsc(FileTaskEntity::getCreatedAt)
|
||||
.last("limit 200"));
|
||||
}
|
||||
|
||||
private SubmitContext persistSubmittedChunk(Long taskId, SimilarAsinSubmitResultRequest request) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
|
||||
@@ -760,13 +783,26 @@ public class SimilarAsinTaskService {
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || STATUS_SUCCESS.equals(task.getStatus())) {
|
||||
return;
|
||||
}
|
||||
TaskChunkEntity chunk = taskChunkMapper.selectOne(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, task.getId())
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(TaskChunkEntity::getScopeHash, context.scopeHash())
|
||||
.eq(TaskChunkEntity::getChunkIndex, context.chunkIndex())
|
||||
.last("limit 1"));
|
||||
if (chunk == null || readChunkRows(chunk).isEmpty()) {
|
||||
List<TaskChunkEntity> chunks;
|
||||
if (context.scopeHash() == null || context.scopeHash().isBlank() || context.chunkIndex() == null) {
|
||||
chunks = taskChunkMapper.selectList(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, task.getId())
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE)
|
||||
.orderByAsc(TaskChunkEntity::getChunkIndex));
|
||||
} else {
|
||||
TaskChunkEntity chunk = taskChunkMapper.selectOne(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, task.getId())
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(TaskChunkEntity::getScopeHash, context.scopeHash())
|
||||
.eq(TaskChunkEntity::getChunkIndex, context.chunkIndex())
|
||||
.last("limit 1"));
|
||||
chunks = chunk == null ? List.of() : List.of(chunk);
|
||||
}
|
||||
chunks = chunks == null ? List.of() : chunks.stream()
|
||||
.filter(Objects::nonNull)
|
||||
.filter(chunk -> !readChunkRows(chunk).isEmpty())
|
||||
.toList();
|
||||
if (chunks.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
FileResultEntity result = findOrCreateResultRecordForAssembly(task, allRowCount(task));
|
||||
@@ -779,24 +815,131 @@ public class SimilarAsinTaskService {
|
||||
return;
|
||||
}
|
||||
Map<String, List<SimilarAsinParsedRowVo>> allRowsByBaseId = loadAllRowsByBaseId(task);
|
||||
boolean pendingCoze = submitCozeBatches(task, result, job, List.of(chunk), allRowsByBaseId);
|
||||
boolean pendingCoze = submitCozeBatches(task, result, job, chunks, allRowsByBaseId);
|
||||
if (pendingCoze) {
|
||||
taskFileJobService.touchRunning(job.getId());
|
||||
touchJavaSideTaskActivity(task.getId());
|
||||
} else if (isResultSubmissionComplete(task.getId())) {
|
||||
maybeFinalizeCozeJobLocked(task.getId(), new CozeBatchContext(
|
||||
job.getId(), result.getId(), chunk.getScopeHash(), chunk.getChunkIndex(), 1, 1, currentInstanceId(), 0));
|
||||
job.getId(), result.getId(), context.scopeHash(), context.chunkIndex(), 1, 1, currentInstanceId(), 0));
|
||||
}
|
||||
}
|
||||
|
||||
private void scheduleCozePipelineForSubmittedChunk(SubmitContext context) {
|
||||
if (context == null || context.task() == null || context.task().getId() == null) {
|
||||
return;
|
||||
}
|
||||
FileTaskEntity task = fileTaskMapper.selectById(context.task().getId());
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || STATUS_SUCCESS.equals(task.getStatus())) {
|
||||
return;
|
||||
}
|
||||
List<TaskChunkEntity> chunks = taskChunkMapper.selectList(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, task.getId())
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE)
|
||||
.orderByAsc(TaskChunkEntity::getChunkIndex));
|
||||
if (chunks.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
FileResultEntity result = findOrCreateResultRecordForAssembly(task, allRowCount(task));
|
||||
if (result == null) {
|
||||
return;
|
||||
}
|
||||
TaskFileJobEntity job = taskFileJobService.enqueueAssembleResult(
|
||||
task.getId(), MODULE_TYPE, result.getId(), buildTaskOwnerScopeKey(task));
|
||||
if (job == null || "SUCCESS".equals(job.getStatus())) {
|
||||
return;
|
||||
}
|
||||
taskFileJobService.requeue(job.getId(), "Similar ASIN result uploaded, scheduling Coze/file assembly");
|
||||
touchJavaSideTaskActivity(task.getId());
|
||||
}
|
||||
|
||||
private void finalizeStaleTask(Long taskId, String error) {
|
||||
FileTaskEntity task = fileTaskMapper.selectById(taskId);
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !STATUS_RUNNING.equals(task.getStatus())) {
|
||||
return;
|
||||
}
|
||||
if (tryRecoverTimedOutPythonTask(task)) {
|
||||
return;
|
||||
}
|
||||
finalizeTask(task, error, allRowCount(task), true);
|
||||
}
|
||||
|
||||
private boolean tryRecoverTimedOutPythonTask(FileTaskEntity task) {
|
||||
if (task == null || task.getId() == null) {
|
||||
return false;
|
||||
}
|
||||
Long taskId = task.getId();
|
||||
boolean uploadComplete = isResultSubmissionComplete(taskId);
|
||||
long pendingCozeStates = countPendingCozeStates(taskId);
|
||||
long activeAssembleJobs = taskFileJobService.countActiveAssembleJobs(taskId, MODULE_TYPE);
|
||||
if (uploadComplete && (pendingCozeStates > 0 || activeAssembleJobs > 0)) {
|
||||
touchJavaSideTaskActivity(taskId);
|
||||
return true;
|
||||
}
|
||||
if (!hasPersistedResultRows(taskId)) {
|
||||
return false;
|
||||
}
|
||||
if (!uploadComplete) {
|
||||
int forcedScopes = markSubmissionCompleteOnPythonTimeout(taskId);
|
||||
if (forcedScopes <= 0) {
|
||||
return false;
|
||||
}
|
||||
log.warn("[similar-asin] python heartbeat timed out, forcing finalize pipeline taskId={} pendingCozeStates={} activeAssembleJobs={} forcedScopes={}",
|
||||
taskId, pendingCozeStates, activeAssembleJobs, forcedScopes);
|
||||
} else {
|
||||
log.warn("[similar-asin] stale running task resuming coze/file assembly after python timeout taskId={} pendingCozeStates={} activeAssembleJobs={}",
|
||||
taskId, pendingCozeStates, activeAssembleJobs);
|
||||
}
|
||||
submitCozeForSubmittedChunk(new SubmitContext(task, null, null, null, true, null));
|
||||
touchJavaSideTaskActivity(taskId);
|
||||
return true;
|
||||
}
|
||||
|
||||
private int markSubmissionCompleteOnPythonTimeout(Long taskId) {
|
||||
if (taskId == null || taskId <= 0) {
|
||||
return 0;
|
||||
}
|
||||
List<TaskScopeStateEntity> inputStates = taskScopeStateMapper.selectList(new LambdaQueryWrapper<TaskScopeStateEntity>()
|
||||
.eq(TaskScopeStateEntity::getTaskId, taskId)
|
||||
.eq(TaskScopeStateEntity::getModuleType, MODULE_TYPE)
|
||||
.isNull(TaskScopeStateEntity::getCozeStatus)
|
||||
.orderByDesc(TaskScopeStateEntity::getUpdatedAt));
|
||||
if (inputStates == null || inputStates.isEmpty()) {
|
||||
TaskChunkEntity latestChunk = taskChunkMapper.selectOne(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, taskId)
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE)
|
||||
.orderByDesc(TaskChunkEntity::getUpdatedAt)
|
||||
.last("limit 1"));
|
||||
if (latestChunk == null || latestChunk.getScopeHash() == null || latestChunk.getScopeHash().isBlank()) {
|
||||
return 0;
|
||||
}
|
||||
upsertScopeState(taskId,
|
||||
firstNonBlank(latestChunk.getScopeKey(), "task:" + taskId),
|
||||
latestChunk.getScopeHash(),
|
||||
latestChunk.getChunkTotal(),
|
||||
null,
|
||||
true,
|
||||
false);
|
||||
return 1;
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
int updated = 0;
|
||||
for (TaskScopeStateEntity state : inputStates) {
|
||||
if (state == null || state.getId() == null) {
|
||||
continue;
|
||||
}
|
||||
state.setCompleted(1);
|
||||
if (state.getLastChunkAt() == null) {
|
||||
state.setLastChunkAt(now);
|
||||
}
|
||||
state.setUpdatedAt(now);
|
||||
state.setStateJson("{\"phase\":\"RECEIVED\",\"coze\":\"PENDING\"}");
|
||||
taskScopeStateMapper.updateById(state);
|
||||
updated++;
|
||||
}
|
||||
return updated;
|
||||
}
|
||||
|
||||
private void upsertScopeState(Long taskId,
|
||||
String scopeKey,
|
||||
String scopeHash,
|
||||
@@ -905,20 +1048,14 @@ public class SimilarAsinTaskService {
|
||||
if (persistedRows.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
List<SimilarAsinResultRowDto> unresolvedRows = pickGroupRepresentativesForCoze(persistedRows.values());
|
||||
List<SimilarAsinResultRowDto> unresolvedRows = collectPendingCozeRows(persistedRows.values());
|
||||
if (unresolvedRows.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
List<SimilarAsinResultRowDto> cozeRows = applyCozeInBatches(unresolvedRows, task, progressHook);
|
||||
Map<String, SimilarAsinResultRowDto> mergedRows = new LinkedHashMap<>();
|
||||
for (SimilarAsinResultRowDto resultRow : cozeRows) {
|
||||
for (SimilarAsinResultRowDto expandedRow : expandRows(List.of(resultRow), allRowsByBaseId)) {
|
||||
mergedRows.put(rowKey(expandedRow), expandedRow);
|
||||
}
|
||||
}
|
||||
mergeChunkPayload(task.getId(), chunk.getScopeHash(), chunk.getChunkIndex(), new ArrayList<>(mergedRows.values()));
|
||||
mergeChunkPayload(task.getId(), chunk.getScopeHash(), chunk.getChunkIndex(), cozeRows);
|
||||
log.info("[similar-asin] async coze chunk merged taskId={} chunk={} unresolved={} merged={}",
|
||||
task.getId(), chunk.getChunkIndex(), unresolvedRows.size(), mergedRows.size());
|
||||
task.getId(), chunk.getChunkIndex(), unresolvedRows.size(), cozeRows.size());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -951,44 +1088,22 @@ public class SimilarAsinTaskService {
|
||||
transientPayloadStorageService.deleteReplacedPayloadIfNeeded(oldPayload, storedPayload);
|
||||
}
|
||||
|
||||
private List<SimilarAsinResultRowDto> expandRows(List<SimilarAsinResultRowDto> representatives,
|
||||
Map<String, List<SimilarAsinParsedRowVo>> allRowsByBaseId) {
|
||||
if (representatives == null || representatives.isEmpty()) {
|
||||
private List<SimilarAsinResultRowDto> expandRows(List<SimilarAsinResultRowDto> rows,
|
||||
Map<String, List<SimilarAsinParsedRowVo>> allRowsByBaseId) {
|
||||
if (rows == null || rows.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
List<SimilarAsinResultRowDto> result = new ArrayList<>();
|
||||
Set<String> emittedKeys = new LinkedHashSet<>();
|
||||
for (SimilarAsinResultRowDto representative : representatives) {
|
||||
String key = firstNonBlank(normalize(representative.getRowToken()), rowKey(representative));
|
||||
for (SimilarAsinResultRowDto row : rows) {
|
||||
String key = firstNonBlank(normalize(row.getRowToken()), rowKey(row));
|
||||
if (emittedKeys.add(key)) {
|
||||
result.add(representative);
|
||||
result.add(row);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private List<SimilarAsinParsedRowVo> resolveSiblingRows(SimilarAsinResultRowDto representative,
|
||||
Map<String, List<SimilarAsinParsedRowVo>> groupedRows) {
|
||||
if (representative == null || groupedRows == null || groupedRows.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
String representativeGroupKey = normalize(representative.getGroupKey());
|
||||
if (!representativeGroupKey.isBlank()) {
|
||||
return groupedRows.getOrDefault(representativeGroupKey, List.of());
|
||||
}
|
||||
String representativeKey = rowKey(representative);
|
||||
String representativeLegacyKey = legacyRowKey(representative);
|
||||
for (List<SimilarAsinParsedRowVo> rows : groupedRows.values()) {
|
||||
for (SimilarAsinParsedRowVo row : rows) {
|
||||
if (Objects.equals(representativeKey, rowKey(row))
|
||||
|| Objects.equals(representativeLegacyKey, legacyRowKey(row))) {
|
||||
return rows;
|
||||
}
|
||||
}
|
||||
}
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private Map<String, List<SimilarAsinParsedRowVo>> loadAllRowsByBaseId(FileTaskEntity task) {
|
||||
try {
|
||||
SimilarAsinParsedPayloadDto payload = readParsedPayload(task);
|
||||
@@ -1009,17 +1124,17 @@ public class SimilarAsinTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
private List<SimilarAsinResultRowDto> pickGroupRepresentativesForCoze(java.util.Collection<SimilarAsinResultRowDto> rows) {
|
||||
private List<SimilarAsinResultRowDto> collectPendingCozeRows(java.util.Collection<SimilarAsinResultRowDto> rows) {
|
||||
if (rows == null) {
|
||||
return List.of();
|
||||
}
|
||||
List<SimilarAsinResultRowDto> representatives = new ArrayList<>();
|
||||
List<SimilarAsinResultRowDto> pendingRows = new ArrayList<>();
|
||||
for (SimilarAsinResultRowDto row : rows) {
|
||||
if (row != null && !hasResolvedCozeFields(row) && shouldInspectRow(row)) {
|
||||
representatives.add(row);
|
||||
pendingRows.add(row);
|
||||
}
|
||||
}
|
||||
return representatives;
|
||||
return pendingRows;
|
||||
}
|
||||
|
||||
private List<SimilarAsinParsedGroupVo> buildParsedGroups(List<SimilarAsinParsedRowVo> rows) {
|
||||
@@ -1065,6 +1180,7 @@ public class SimilarAsinTaskService {
|
||||
vo.setGroupKey(row.getGroupKey());
|
||||
vo.setAsin(row.getAsin());
|
||||
vo.setCountry(row.getCountry());
|
||||
vo.setSku(row.getSku());
|
||||
vo.setPrice(row.getPrice());
|
||||
vo.setUrl(row.getUrl());
|
||||
vo.setTitle(row.getTitle());
|
||||
@@ -1113,7 +1229,7 @@ public class SimilarAsinTaskService {
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
return request.getItems() == null ? List.of() : request.getItems();
|
||||
return List.of();
|
||||
}
|
||||
|
||||
private int allRowCount(FileTaskEntity task) {
|
||||
@@ -1139,36 +1255,6 @@ public class SimilarAsinTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
private SimilarAsinResultRowDto copyResultToSibling(SimilarAsinResultRowDto representative, SimilarAsinParsedRowVo sibling) {
|
||||
SimilarAsinResultRowDto row = new SimilarAsinResultRowDto();
|
||||
row.setSourceFileKey(sibling.getSourceFileKey());
|
||||
row.setSourceFilename(sibling.getSourceFilename());
|
||||
row.setRowToken(sibling.getRowToken());
|
||||
row.setGroupKey(sibling.getGroupKey());
|
||||
row.setId(sibling.getDisplayId());
|
||||
row.setAsin(sibling.getAsin());
|
||||
row.setCountry(sibling.getCountry());
|
||||
row.setPrice(firstNonBlank(representative.getPrice(), sibling.getPrice()));
|
||||
if (representative.hasImageUrl()) {
|
||||
row.setUrls(representative.getUrls());
|
||||
} else {
|
||||
row.setUrl(sibling.getUrl());
|
||||
}
|
||||
row.setTitle(firstNonBlank(representative.getTitle(), sibling.getTitle()));
|
||||
row.setError(representative.getError());
|
||||
row.setTitleRisk(representative.getTitleRisk());
|
||||
row.setAppearanceRisk(representative.getAppearanceRisk());
|
||||
row.setPatentRisk(representative.getPatentRisk());
|
||||
row.setConclusion(representative.getConclusion());
|
||||
row.setIsStock(representative.getIsStock());
|
||||
row.setSimilarity(representative.getSimilarity());
|
||||
row.setTitleReason(representative.getTitleReason());
|
||||
row.setAppearanceReason(representative.getAppearanceReason());
|
||||
row.setPatentReason(representative.getPatentReason());
|
||||
row.setDone(representative.getDone());
|
||||
return row;
|
||||
}
|
||||
|
||||
private String readAiPrompt(FileTaskEntity task) {
|
||||
try {
|
||||
return readParsedPayload(task).getAiPrompt();
|
||||
@@ -1291,15 +1377,17 @@ public class SimilarAsinTaskService {
|
||||
if (job == null || job.getTaskId() == null || job.getResultId() == null) {
|
||||
throw new BusinessException("result file job arguments are incomplete");
|
||||
}
|
||||
FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId());
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
|
||||
throw new BusinessException("task not found");
|
||||
}
|
||||
ensureTaskOwnedByCurrentInstance(task, "assemble result file");
|
||||
job.setScopeKey(buildTaskOwnerScopeKey(task));
|
||||
if (!isJobOwnedByCurrentInstance(job)) {
|
||||
log.info("[similar-asin] skip result file job because owner is another instance jobId={} taskId={} owner={} current={}",
|
||||
job.getId(), job.getTaskId(), ownerFromScopeKey(job.getScopeKey()), currentInstanceId());
|
||||
return false;
|
||||
}
|
||||
FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId());
|
||||
if (task == null || !MODULE_TYPE.equals(task.getModuleType())) {
|
||||
throw new BusinessException("task not found");
|
||||
}
|
||||
FileResultEntity result = fileResultMapper.selectById(job.getResultId());
|
||||
if (result == null || !MODULE_TYPE.equals(result.getModuleType())) {
|
||||
throw new BusinessException("result record not found");
|
||||
@@ -1317,6 +1405,12 @@ public class SimilarAsinTaskService {
|
||||
saveFileBuildProgress(task, job, totalProgressUnits, 1, "Coze submitted, waiting for result");
|
||||
return false;
|
||||
}
|
||||
if (STATUS_RUNNING.equals(task.getStatus()) && !isResultSubmissionComplete(task.getId())) {
|
||||
taskFileJobService.touchRunning(job.getId());
|
||||
touchJavaSideTaskActivity(task.getId());
|
||||
saveFileBuildProgress(task, job, totalProgressUnits, Math.max(1, cozeWorkUnits), "Waiting for Python upload");
|
||||
return false;
|
||||
}
|
||||
saveFileBuildProgress(task, job, totalProgressUnits, 0, "Submitting Coze");
|
||||
boolean pendingCoze = submitCozeBatches(task, result, job, chunks, allRowsByBaseId);
|
||||
if (pendingCoze) {
|
||||
@@ -1325,12 +1419,6 @@ public class SimilarAsinTaskService {
|
||||
saveFileBuildProgress(task, job, totalProgressUnits, 1, "Coze submitted, waiting for result");
|
||||
return false;
|
||||
}
|
||||
if (STATUS_RUNNING.equals(task.getStatus()) && !isResultSubmissionComplete(task.getId())) {
|
||||
taskFileJobService.touchRunning(job.getId());
|
||||
touchJavaSideTaskActivity(task.getId());
|
||||
saveFileBuildProgress(task, job, totalProgressUnits, Math.max(1, cozeWorkUnits), "Waiting for Python upload");
|
||||
return false;
|
||||
}
|
||||
completeCozeFileJob(task, result, job, totalProgressUnits, cozeWorkUnits);
|
||||
return true;
|
||||
}
|
||||
@@ -1384,7 +1472,7 @@ public class SimilarAsinTaskService {
|
||||
if (persistedRows.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
List<SimilarAsinResultRowDto> unresolvedRows = pickGroupRepresentativesForCoze(persistedRows.values());
|
||||
List<SimilarAsinResultRowDto> unresolvedRows = collectPendingCozeRows(persistedRows.values());
|
||||
if (unresolvedRows.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
@@ -2232,7 +2320,7 @@ public class SimilarAsinTaskService {
|
||||
if (persistedRows.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
int unresolved = pickGroupRepresentativesForCoze(persistedRows.values()).size();
|
||||
int unresolved = collectPendingCozeRows(persistedRows.values()).size();
|
||||
if (unresolved > 0) {
|
||||
total += Math.max(1, (unresolved + batchSize - 1) / batchSize);
|
||||
}
|
||||
@@ -2280,7 +2368,7 @@ public class SimilarAsinTaskService {
|
||||
SimilarAsinParsedPayloadDto parsed = readParsedPayload(task);
|
||||
Map<String, SimilarAsinResultRowDto> resultMap = loadPersistedResultRowsWithRetry(task.getId(), parsed.getAllItems().size());
|
||||
long resolvedRows = parsed.getAllItems().stream()
|
||||
.filter(row -> findResultRow(row, resultMap) != null || findResultRowByAsin(row.getAsin(), resultMap) != null)
|
||||
.filter(row -> findResultRow(row, resultMap) != null)
|
||||
.count();
|
||||
log.info("[similar-asin] assemble workbook taskId={} parsedRows={} resultRows={} resolvedRows={}",
|
||||
task.getId(), parsed.getAllItems().size(), resultMap.size(), resolvedRows);
|
||||
@@ -2381,19 +2469,18 @@ public class SimilarAsinTaskService {
|
||||
int rowIndex = 1;
|
||||
for (SimilarAsinParsedRowVo parsedRow : parsed.getAllItems()) {
|
||||
SimilarAsinResultRowDto resultRow = findResultRow(parsedRow, resultMap);
|
||||
if (resultRow == null) {
|
||||
resultRow = findResultRowByAsin(parsedRow.getAsin(), resultMap);
|
||||
}
|
||||
Row row = sheet.createRow(rowIndex++);
|
||||
int col = 0;
|
||||
row.createCell(col++).setCellValue(firstNonBlank(parsedRow.getDisplayId(), parsedRow.getSourceId()));
|
||||
row.createCell(col++).setCellValue(firstNonBlank(resultRow == null ? parsedRow.getSku() : firstNonBlank(resultRow.getSku(), parsedRow.getSku()), ""));
|
||||
row.createCell(col++).setCellValue(firstNonBlank(parsedRow.getAsin(), ""));
|
||||
row.createCell(col++).setCellValue(firstNonBlank(parsedRow.getCountry(), ""));
|
||||
row.createCell(col++).setCellValue(resultRow == null
|
||||
? firstNonBlank(parsedRow.getPrice(), readValueByHeader(parsedRow, "价格", "price"))
|
||||
: firstNonBlank(resultRow.getPrice(), firstNonBlank(parsedRow.getPrice(), readValueByHeader(parsedRow, "价格", "price"))));
|
||||
row.createCell(col++).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getIsStock(), ""));
|
||||
row.createCell(col).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getSimilarity(), ""));
|
||||
row.createCell(col++).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getSimilarity(), ""));
|
||||
row.createCell(col++).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getIsConform(), ""));
|
||||
row.createCell(col++).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getReason(), ""));
|
||||
row.createCell(col++).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getCategory(), ""));
|
||||
row.createCell(col).setCellValue(resultRow == null ? "" : firstNonBlank(resultRow.getStatus(), ""));
|
||||
}
|
||||
workbook.write(fos);
|
||||
workbook.dispose();
|
||||
@@ -2402,26 +2489,6 @@ public class SimilarAsinTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
private SimilarAsinResultRowDto findResultRowByAsin(String asin, Map<String, SimilarAsinResultRowDto> resultMap) {
|
||||
String normalizedAsin = normalize(asin).toUpperCase(Locale.ROOT);
|
||||
if (normalizedAsin.isBlank() || resultMap == null || resultMap.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
SimilarAsinResultRowDto fallback = null;
|
||||
for (SimilarAsinResultRowDto row : resultMap.values()) {
|
||||
if (row == null || !normalizedAsin.equals(normalize(row.getAsin()).toUpperCase(Locale.ROOT))) {
|
||||
continue;
|
||||
}
|
||||
if (hasResolvedCozeFields(row)) {
|
||||
return row;
|
||||
}
|
||||
if (fallback == null) {
|
||||
fallback = row;
|
||||
}
|
||||
}
|
||||
return fallback;
|
||||
}
|
||||
|
||||
private String imageUrlCellValue(SimilarAsinResultRowDto resultRow, String fallbackUrl) {
|
||||
if (resultRow == null) {
|
||||
return firstNonBlank(fallbackUrl, "");
|
||||
@@ -2446,6 +2513,7 @@ public class SimilarAsinTaskService {
|
||||
int idCol = findRequiredHeader(headerMap, "id");
|
||||
int asinCol = findRequiredHeader(headerMap, "asin");
|
||||
int countryCol = findRequiredHeader(headerMap, "国家", "country");
|
||||
int skuCol = findOptionalHeaderExact(headerMap, "sku", "seller sku", "seller_sku", "msku", "货号");
|
||||
int priceCol = findOptionalHeaderExact(headerMap, "价格", "price");
|
||||
int urlCol = findOptionalHeaderExact(headerMap,
|
||||
"url", "rul", "link", "image", "img", "pic", "picture",
|
||||
@@ -2489,6 +2557,7 @@ public class SimilarAsinTaskService {
|
||||
vo.setRowToken(buildRowToken(source.getFileKey(), vo.getRowIndex()));
|
||||
vo.setAsin(asin);
|
||||
vo.setCountry(country);
|
||||
vo.setSku(skuCol >= 0 ? cell(row, skuCol, formatter) : "");
|
||||
vo.setPrice(priceCol >= 0 ? cell(row, priceCol, formatter) : "");
|
||||
vo.setUrl(urlCol >= 0 ? cell(row, urlCol, formatter) : "");
|
||||
vo.setTitle(titleCol >= 0 ? cell(row, titleCol, formatter) : "");
|
||||
@@ -2548,7 +2617,11 @@ public class SimilarAsinTaskService {
|
||||
|| hasUsableCozeField(row.getPatentRisk())
|
||||
|| hasUsableCozeField(row.getConclusion())
|
||||
|| hasUsableCozeField(row.getIsStock())
|
||||
|| hasUsableCozeField(row.getSimilarity());
|
||||
|| hasUsableCozeField(row.getSimilarity())
|
||||
|| hasUsableCozeField(row.getIsConform())
|
||||
|| hasUsableCozeField(row.getReason())
|
||||
|| hasUsableCozeField(row.getCategory())
|
||||
|| hasUsableCozeField(row.getStatus());
|
||||
}
|
||||
|
||||
private boolean hasUsableCozeField(String value) {
|
||||
@@ -2833,9 +2906,9 @@ public class SimilarAsinTaskService {
|
||||
payload.setApiKey(normalize(apiKey));
|
||||
payload.setSourceFiles(sourceFiles == null ? List.of() : sourceFiles);
|
||||
payload.setHeaders(headers == null ? List.of() : headers);
|
||||
payload.setItems(List.of());
|
||||
payload.setItems(allRows == null ? List.of() : new ArrayList<>(allRows));
|
||||
payload.setGroups(groups == null ? List.of() : groups);
|
||||
payload.setAllItems(List.of());
|
||||
payload.setAllItems(allRows == null ? List.of() : new ArrayList<>(allRows));
|
||||
return writeJson(payload, "保存解析结果失败");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user