fix(brand-label): 品牌标签清洗抽公共件,六模块读写两端统一过出口
PublishBrandLabel 从 publish 私有件搬入 common/util/BrandLabel(三条守卫尺子随迁: 唯一副本、实体写出不许绕过、解析端不许重复实现),品牌列的读入与出件两端都走这一处。 读入端接上:asincache 缓存落库、invalidasin 人工黑名单(先洗再判空——键对不上是静默失效, 比脏值出件更难发现)、appearancepatent resolveBrand(两条取值分支同一个串)、collectdata 入库、shopdatacrawl copyRow/sameRow/rowDedupKey(键与值分家会让同一行跨分片重复出件)、 撞款解析与 re-baseline、dedupe 按表头名只洗品牌列。 写出端接上:publish/similarasin×2/appearancepatent/collectdata/撞款 csv+xlsx/shopdatacrawl。 rows-snapshot golden 里品牌格去掉首尾空格:正本 strip 自 2026-10-08 就含 trim, Java/Python/MySQL 三处同形,不是这次新加的行为。 门禁:后端 mvn -o test 4594 例 0 红。BrandTaskService(含四张 sheet 出件与解析端匹配) 因同仓另一路在飞改动未动,见 docs/audit/BACKLOG.md B5。
This commit is contained in:
+4
-1
@@ -1,5 +1,6 @@
|
||||
package com.nanri.aiimage.modules.collectdata.service;
|
||||
|
||||
import com.nanri.aiimage.common.util.BrandLabel;
|
||||
import com.nanri.aiimage.common.util.UserMessages;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.util.SxssfWorkbookWriter;
|
||||
@@ -140,7 +141,9 @@ public class CollectDataExcelAssemblyService {
|
||||
continue;
|
||||
}
|
||||
Row row = sheet.createRow((int) state[0]++);
|
||||
SxssfWorkbookWriter.setText(row, 0, item.getBrand());
|
||||
// 出件这一端也要过一遍:干净值不等于干净文件——这份 Excel 是用户的下一份上传物,
|
||||
// 而改口径之前落库的历史明细 payload 里仍可能带着标签前缀。
|
||||
SxssfWorkbookWriter.setText(row, 0, BrandLabel.strip(item.getBrand()));
|
||||
SxssfWorkbookWriter.setText(row, 1, item.getAsin());
|
||||
SxssfWorkbookWriter.setText(row, 2, item.getPrice());
|
||||
SxssfWorkbookWriter.setText(row, 3, item.getSellerName());
|
||||
|
||||
+4
-1
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode;
|
||||
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.util.BrandLabel;
|
||||
import com.nanri.aiimage.common.util.ExcelStreamReader;
|
||||
import com.nanri.aiimage.modules.asincache.service.AsinResultCacheService;
|
||||
import com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper;
|
||||
@@ -971,7 +972,9 @@ public class CollectDataService extends AbstractFileTaskPipeline<CollectDataResu
|
||||
continue;
|
||||
}
|
||||
CollectDataResultRowVo row = new CollectDataResultRowVo();
|
||||
row.setBrand(normalize(raw.getBrand()));
|
||||
// 品牌在前端复制自亚马逊详情页的署名行("Brand: XXX"),客户端原样回传就带着标签前缀:
|
||||
// 带着它去查品牌库会被当 Solr 字段限定符打成上游 500。剥标签只认 BrandLabel 这一处口径。
|
||||
row.setBrand(BrandLabel.strip(normalize(raw.getBrand())));
|
||||
row.setAsin(normalizeAsin(raw.getAsin()));
|
||||
row.setPrice(normalize(raw.getPrice()));
|
||||
row.setSellerName(normalize(raw.getSellerName()));
|
||||
|
||||
Reference in New Issue
Block a user