From 326f78705d93b26c4ce36d883c8efb6969b57726 Mon Sep 17 00:00:00 2001 From: super <2903208875@qq.com> Date: Thu, 23 Apr 2026 20:48:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9F=A5=E8=AF=A2asin?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/approve.cpython-312.pyc | Bin 56353 -> 55959 bytes .../__pycache__/del_brand.cpython-312.pyc | Bin 30775 -> 30776 bytes app/amazon/__pycache__/main.cpython-312.pyc | Bin 29925 -> 29925 bytes .../__pycache__/match_action.cpython-312.pyc | Bin 33631 -> 33733 bytes .../__pycache__/price_match.cpython-312.pyc | Bin 52331 -> 56585 bytes app/main.py | 2 +- .../config/ModuleCleanupProperties.java | 2 +- .../PermissionMenuSchemaInitializer.java | 1 + .../service/PriceTrackTaskService.java | 5 +- .../model/vo/ProductRiskShopQueueItemVo.java | 13 +- .../controller/QueryAsinTaskController.java | 374 ++++++ .../mapper/QueryAsinShopCandidateMapper.java | 10 + .../model/dto/QueryAsinCartRatioDto.java | 16 + .../model/dto/QueryAsinCountryAsinsDto.java | 18 + .../dto/QueryAsinCountryMetricRowDto.java | 25 + .../model/dto/QueryAsinCountrySectionDto.java | 19 + .../model/dto/QueryAsinCreateTaskRequest.java | 27 + .../model/dto/QueryAsinShopPayloadDto.java | 49 + .../dto/QueryAsinSubmitResultRequest.java | 20 + .../model/dto/QueryAsinTaskBatchRequest.java | 15 + .../model/dto/QueryAsinTaskItemDto.java | 45 + .../entity/QueryAsinShopCandidateEntity.java | 20 + .../model/vo/QueryAsinCreateTaskVo.java | 14 + .../model/vo/QueryAsinHistoryVo.java | 13 + .../model/vo/QueryAsinResultItemVo.java | 57 + .../model/vo/QueryAsinTaskBatchVo.java | 15 + .../QueryAsinExcelAssemblyService.java | 112 ++ .../service/QueryAsinResolveService.java | 221 ++++ .../service/QueryAsinTaskCacheService.java | 168 +++ .../service/QueryAsinTaskService.java | 960 ++++++++++++++ .../controller/QueryAsinController.java | 125 ++ .../shopkey/mapper/QueryAsinMapper.java | 55 + .../dto/QueryAsinCountryUpdateRequest.java | 13 + .../model/dto/QueryAsinCreateRequest.java | 32 + .../shopkey/model/entity/QueryAsinEntity.java | 44 + .../model/vo/QueryAsinImportProgressVo.java | 16 + .../model/vo/QueryAsinImportStartVo.java | 9 + .../shopkey/model/vo/QueryAsinItemVo.java | 21 + .../shopkey/model/vo/QueryAsinPageVo.java | 15 + .../shopkey/service/QueryAsinService.java | 828 ++++++++++++ .../service/ShopManageGroupService.java | 8 + .../TaskScopePayloadStorageService.java | 3 +- .../src/main/resources/db/V31__query_asin.sql | 28 + ...uery_asin_allow_multiple_rows_per_shop.sql | 32 + .../db/V33__query_asin_task_candidate.sql | 8 + backend/__pycache__/config.cpython-312.pyc | Bin 1510 -> 1510 bytes backend/blueprints/admin_api.py | 287 +++- backend/web_source/admin.html | 707 +++++++++- frontend-vue/query-asin.html | 13 + .../brand/components/BrandPatrolDeleteTab.vue | 22 + .../brand/components/BrandPriceTrackTab.vue | 29 + .../brand/components/BrandProductRiskTab.vue | 31 + .../brand/components/BrandQueryAsinTab.vue | 1167 +++++++++++++++++ .../brand/components/BrandShopMatchTab.vue | 13 +- .../pages/brand/components/BrandTopBar.vue | 2 + frontend-vue/src/query-asin-main.ts | 13 + frontend-vue/src/shared/api/java-modules.ts | 160 +++ frontend-vue/vite.config.ts | 1 + new_web_source/assets/brand-UU-ckLq6.js | 1 + new_web_source/assets/convert-7wWJ02Tw.css | 1 + new_web_source/assets/convert.js | 1 + new_web_source/assets/dedupe-BpNHwt51.css | 1 + new_web_source/assets/dedupe.js | 1 + .../assets/delete-brand-CWLpe7lu.css | 1 + new_web_source/assets/delete-brand.js | 1 + new_web_source/assets/el-input-CezJelDw.css | 1 + .../assets/listingFilters-BpGOU_pJ.js | 1 + .../assets/listingFilters-CK58rX4v.css | 1 + .../assets/patrol-delete-BPu1AAPM.css | 1 + new_web_source/assets/patrol-delete.js | 1 + .../assets/price-track-85NbckiJ.css | 1 + .../assets/price-track-RLJUgMl_.css | 1 + new_web_source/assets/price-track.js | 1 + .../assets/product-risk-cfL3Ch5-.css | 1 + new_web_source/assets/product-risk.js | 1 + new_web_source/assets/pywebview-CeWJDVeG.js | 55 + new_web_source/assets/pywebview-ij4pgMq8.css | 1 + new_web_source/assets/query-asin-B5e5m-vs.css | 1 + new_web_source/assets/query-asin-Ba06RE4W.css | 1 + new_web_source/assets/query-asin-CcqwgsLE.css | 1 + new_web_source/assets/query-asin.js | 1 + new_web_source/assets/shop-match-Banz7DWL.css | 1 + new_web_source/assets/shop-match.js | 1 + new_web_source/assets/split-CRUIYKS6.css | 1 + new_web_source/assets/split.js | 1 + new_web_source/assets/zh-cn-DyKmB71i.js | 1 + new_web_source/convert.html | 6 +- new_web_source/dedupe.html | 6 +- new_web_source/delete-brand.html | 8 +- new_web_source/patrol-delete.html | 8 +- new_web_source/price-track.html | 8 +- new_web_source/product-risk.html | 6 +- new_web_source/query-asin.html | 18 + new_web_source/shop-match.html | 8 +- new_web_source/split.html | 6 +- 95 files changed, 6009 insertions(+), 50 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/controller/QueryAsinTaskController.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/mapper/QueryAsinShopCandidateMapper.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCartRatioDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryAsinsDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryMetricRowDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountrySectionDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCreateTaskRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinShopPayloadDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinSubmitResultRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskBatchRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskItemDto.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/entity/QueryAsinShopCandidateEntity.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinCreateTaskVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinHistoryVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinResultItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinTaskBatchVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskCacheService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/QueryAsinMapper.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCountryUpdateRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCreateRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/QueryAsinEntity.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportProgressVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportStartVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinPageVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java create mode 100644 backend-java/src/main/resources/db/V31__query_asin.sql create mode 100644 backend-java/src/main/resources/db/V32__query_asin_allow_multiple_rows_per_shop.sql create mode 100644 backend-java/src/main/resources/db/V33__query_asin_task_candidate.sql create mode 100644 frontend-vue/query-asin.html create mode 100644 frontend-vue/src/pages/brand/components/BrandQueryAsinTab.vue create mode 100644 frontend-vue/src/query-asin-main.ts create mode 100644 new_web_source/assets/brand-UU-ckLq6.js create mode 100644 new_web_source/assets/convert-7wWJ02Tw.css create mode 100644 new_web_source/assets/convert.js create mode 100644 new_web_source/assets/dedupe-BpNHwt51.css create mode 100644 new_web_source/assets/dedupe.js create mode 100644 new_web_source/assets/delete-brand-CWLpe7lu.css create mode 100644 new_web_source/assets/delete-brand.js create mode 100644 new_web_source/assets/el-input-CezJelDw.css create mode 100644 new_web_source/assets/listingFilters-BpGOU_pJ.js create mode 100644 new_web_source/assets/listingFilters-CK58rX4v.css create mode 100644 new_web_source/assets/patrol-delete-BPu1AAPM.css create mode 100644 new_web_source/assets/patrol-delete.js create mode 100644 new_web_source/assets/price-track-85NbckiJ.css create mode 100644 new_web_source/assets/price-track-RLJUgMl_.css create mode 100644 new_web_source/assets/price-track.js create mode 100644 new_web_source/assets/product-risk-cfL3Ch5-.css create mode 100644 new_web_source/assets/product-risk.js create mode 100644 new_web_source/assets/pywebview-CeWJDVeG.js create mode 100644 new_web_source/assets/pywebview-ij4pgMq8.css create mode 100644 new_web_source/assets/query-asin-B5e5m-vs.css create mode 100644 new_web_source/assets/query-asin-Ba06RE4W.css create mode 100644 new_web_source/assets/query-asin-CcqwgsLE.css create mode 100644 new_web_source/assets/query-asin.js create mode 100644 new_web_source/assets/shop-match-Banz7DWL.css create mode 100644 new_web_source/assets/shop-match.js create mode 100644 new_web_source/assets/split-CRUIYKS6.css create mode 100644 new_web_source/assets/split.js create mode 100644 new_web_source/assets/zh-cn-DyKmB71i.js create mode 100644 new_web_source/query-asin.html diff --git a/app/amazon/__pycache__/approve.cpython-312.pyc b/app/amazon/__pycache__/approve.cpython-312.pyc index 7ad524be7377c91206ad098267923847a4e7f452..859dd8ca81f1bf1dfed253f1acbccd2def5a0125 100644 GIT binary patch delta 4211 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 E0jH6zegFUf diff --git a/app/amazon/__pycache__/del_brand.cpython-312.pyc b/app/amazon/__pycache__/del_brand.cpython-312.pyc index 2796b78318d473bdae5aee313928a2fbc87f189d..29fec4d21478644039c065ab004c55a6ee42c814 100644 GIT binary patch delta 96 zcmdn~fpNzNM&8rByj%=GPHz delta 94 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 Kz>lBEMgI*H3XxC% diff --git a/app/amazon/__pycache__/price_match.cpython-312.pyc b/app/amazon/__pycache__/price_match.cpython-312.pyc index 8fbcf0599ffde4f42d81fbe1d7dd54df1d0abf12..b3bad90cd09e40011ac40d539e473c12060d1c57 100644 GIT binary patch delta 16453 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 HYuWz?+4XD2 delta 12663 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 pa7WBexV2rmPRY( moduleTypes = new ArrayList<>(List.of("DEDUPE", "SPLIT", "CONVERT", "DELETE_BRAND", "PRODUCT_RISK_RESOLVE", "PRICE_TRACK", "SHOP_MATCH", "PATROL_DELETE")); + private List moduleTypes = new ArrayList<>(List.of("DEDUPE", "SPLIT", "CONVERT", "DELETE_BRAND", "PRODUCT_RISK_RESOLVE", "PRICE_TRACK", "SHOP_MATCH", "PATROL_DELETE", "QUERY_ASIN")); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java index fd309f9..346beac 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java @@ -28,6 +28,7 @@ public class PermissionMenuSchemaInitializer { new DefaultAdminMenu("店铺密钥管理", "admin_shop_keys", "shop-keys", 40), new DefaultAdminMenu("店铺管理", "admin_shop_manage", "shop-manage", 50), new DefaultAdminMenu("跳过跟价ASIN", "admin_skip_price_asin", "skip-price-asin", 60), + new DefaultAdminMenu("查询ASIN", "admin_query_asin", "query-asin", 65), new DefaultAdminMenu("查看生成记录", "admin_history", "history", 70), new DefaultAdminMenu("版本管理", "admin_version", "version", 80) ); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java index 43fc570..6c43fb3 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java @@ -1128,9 +1128,8 @@ public class PriceTrackTaskService { if (targetAsin == null || targetAsin.isBlank()) { continue; } - boolean removed = skipPriceAsinService.removeByShopCountryAndAsin(shopKey, countryCode, targetAsin); - log.info("[price-track] skip asin delete signal taskShop={} country={} asin={} removed={} reason={}", - shopKey, countryCode, targetAsin, removed, row.getDeleteReason()); + log.info("[price-track] skip asin delete signal ignored taskShop={} country={} asin={} reason={}", + shopKey, countryCode, targetAsin, row.getDeleteReason()); } } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/vo/ProductRiskShopQueueItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/vo/ProductRiskShopQueueItemVo.java index 17fa8f0..16eecf0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/vo/ProductRiskShopQueueItemVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/model/vo/ProductRiskShopQueueItemVo.java @@ -1,9 +1,13 @@ package com.nanri.aiimage.modules.productrisk.model.vo; import com.fasterxml.jackson.annotation.JsonProperty; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryAsinsDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * 与 Python 队列约定字段对齐，供前端原样推入 enqueue_json。 */ @@ -22,7 +26,7 @@ public class ProductRiskShopQueueItemVo { @Schema(description = "紫鸟侧店铺 ID（字符串），未命中时可能为空") private String shopId; - @Schema(description = "平台，如 亚马逊", example = "亚马逊") + @Schema(description = "平台，例如亚马逊", example = "亚马逊") private String platform; @JsonProperty("companyName") @@ -38,11 +42,14 @@ public class ProductRiskShopQueueItemVo { private Long matchedUserId; @JsonProperty("matchStatus") - @Schema( - description = "匹配状态码：如 MATCHED、PENDING、CONFLICT、INDEX_STALE 等，以后端为准。") + @Schema(description = "匹配状态码：如 MATCHED、PENDING、CONFLICT、INDEX_STALE 等，以后端为准") private String matchStatus; @JsonProperty("matchMessage") @Schema(description = "人类可读说明，供前端展示") private String matchMessage; + + @JsonProperty("queryAsins") + @Schema(description = "查询 ASIN 模块返回的后台维护 ASIN 数据；按全表聚合返回，不按当前店铺过滤") + private List queryAsins = new ArrayList<>(); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/controller/QueryAsinTaskController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/controller/QueryAsinTaskController.java new file mode 100644 index 0000000..6e1a10f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/controller/QueryAsinTaskController.java @@ -0,0 +1,374 @@ +package com.nanri.aiimage.modules.queryasin.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCreateTaskRequest; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinSubmitResultRequest; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinTaskBatchRequest; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinCreateTaskVo; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinHistoryVo; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinTaskBatchVo; +import com.nanri.aiimage.modules.queryasin.service.QueryAsinResolveService; +import com.nanri.aiimage.modules.queryasin.service.QueryAsinTaskService; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskMatchShopsRequest; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskCandidateVo; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskDashboardVo; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskMatchShopsVo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import java.io.InputStream; +import java.net.URI; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/query-asin") +@Tag( + name = "查询ASIN", + description = "查询ASIN模块：管理备选店铺、批量匹配紫鸟店铺、创建任务、接收 Python 分片结果、自动收尾生成 Excel 并提供下载。涉及查询和删除的接口需要携带 user_id。") +public class QueryAsinTaskController { + + private final QueryAsinResolveService queryAsinResolveService; + private final QueryAsinTaskService queryAsinTaskService; + + @GetMapping("/candidates") + @Operation(summary = "查询备选店铺列表", description = "返回当前用户在查询ASIN模块中已保存的备选店铺。") + public ApiResponse> listCandidates( + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId) { + return ApiResponse.success(queryAsinResolveService.listCandidates(userId)); + } + + @PostMapping("/candidates") + @Operation(summary = "新增备选店铺", description = "向查询ASIN备选区新增一条店铺记录，供后续匹配和创建任务使用。") + public ApiResponse addCandidate( + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "新增备选店铺请求，需传入用户 ID 和店铺名。", + required = true, + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ProductRiskCandidateAddRequest.class), + examples = @ExampleObject( + name = "新增店铺示例", + value = """ + { + "user_id": 1, + "shop_name": "郭亚芳" + } + """))) + @Valid @RequestBody ProductRiskCandidateAddRequest request) { + return ApiResponse.success(queryAsinResolveService.addCandidate(request)); + } + + @DeleteMapping("/candidates/{id}") + @Operation(summary = "删除备选店铺", description = "删除当前用户名下的一条备选店铺记录。") + public ApiResponse deleteCandidate( + @Parameter(description = "备选店铺记录主键", example = "10") + @PathVariable Long id, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId) { + queryAsinResolveService.deleteCandidate(userId, id); + return ApiResponse.success(null); + } + + @PostMapping("/match-shops") + @Operation(summary = "批量匹配店铺", description = "根据店铺名批量匹配紫鸟店铺索引，返回是否命中、店铺 ID、平台、公司和匹配状态。") + public ApiResponse matchShops( + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "批量匹配请求，传入 user_id 和待匹配的店铺名称列表。", + required = true, + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = ProductRiskMatchShopsRequest.class), + examples = @ExampleObject( + name = "匹配店铺示例", + value = """ + { + "user_id": 1, + "shop_names": [ + "郭亚芳", + "示例店铺A" + ] + } + """))) + @Valid @RequestBody ProductRiskMatchShopsRequest request) { + return ApiResponse.success(queryAsinResolveService.matchShops(request)); + } + + @GetMapping("/dashboard") + @Operation(summary = "查询统计看板", description = "返回备选店铺数、已处理任务数、成功任务数和失败任务数。") + public ApiResponse dashboard( + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId) { + return ApiResponse.success(queryAsinTaskService.dashboard(userId)); + } + + @GetMapping("/history") + @Operation(summary = "查询任务记录", description = "返回当前用户在查询ASIN模块中的当前任务和历史任务记录。") + public ApiResponse history( + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId) { + return ApiResponse.success(queryAsinTaskService.listHistory(userId)); + } + + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量查询查询ASIN任务进度", description = "仅返回任务状态和店铺结果摘要，用于前端轮询降载。") + public ApiResponse taskProgressBatch(@Valid @RequestBody QueryAsinTaskBatchRequest request) { + return ApiResponse.success(queryAsinTaskService.getTaskProgressBatch(request.getTaskIds())); + } + + @PostMapping("/tasks") + @Operation(summary = "创建查询ASIN任务", description = "根据已匹配的店铺创建任务和占位结果记录，后续由 Python 端处理并回传结果。") + public ApiResponse createTask( + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "创建任务请求。items 中每一项代表一个待处理店铺，需携带默认模板结构。", + required = true, + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = QueryAsinCreateTaskRequest.class), + examples = @ExampleObject( + name = "创建任务示例", + value = """ + { + "user_id": 1, + "items": [ + { + "shopName": "郭亚芳", + "matched": true, + "shopId": "27730548558377", + "platform": "亚马逊", + "companyName": "示例公司", + "matchStatus": "MATCHED", + "matchMessage": "索引已命中", + "countrySections": [ + { + "country": "德国", + "rows": [ + { + "status": "全部", + "quantity": "", + "deleteQuantity": "", + "processStatus": "" + } + ] + } + ], + "cartRatios": [ + { + "country": "德国", + "ratio": "" + } + ] + } + ] + } + """))) + @Valid @RequestBody QueryAsinCreateTaskRequest request) { + return ApiResponse.success(queryAsinTaskService.createTask(request)); + } + + @PostMapping("/tasks/{taskId}/result") + @Operation( + summary = "提交查询ASIN结果", + description = "供 Python 端回传处理结果。支持按店铺分片多次提交，服务端会合并分片、按店铺完成状态自动收尾，并在任务结束后生成 Excel。") + public ApiResponse submitResult( + @Parameter(description = "任务主键，必须是运行中的任务", example = "3089") + @PathVariable Long taskId, + @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "查询ASIN结果回传请求。shops 表示本次提交的店铺结果分片列表。shopDone=true 表示该店铺已全部提交完成。", + required = true, + content = @Content( + mediaType = "application/json", + schema = @Schema(implementation = QueryAsinSubmitResultRequest.class), + examples = { + @ExampleObject( + name = "成功分片示例", + summary = "一个店铺分片回传，包含状态数据和购物车比例数据", + value = """ + { + "shops": [ + { + "shopName": "郭亚芳", + "submissionId": "query-asin:3089:郭亚芳:1711111111111", + "chunkIndex": 1, + "chunkTotal": 2, + "shopDone": false, + "countrySections": [ + { + "country": "德国", + "rows": [ + { + "status": "正常", + "quantity": "12", + "deleteQuantity": "3", + "processStatus": "处理中" + }, + { + "status": "下架", + "quantity": "2", + "deleteQuantity": "2", + "processStatus": "已完成" + } + ] + }, + { + "country": "英国", + "rows": [ + { + "status": "正常", + "quantity": "5", + "deleteQuantity": "1", + "processStatus": "处理中" + } + ] + } + ], + "cartRatios": [ + { + "country": "德国", + "ratio": "25%" + }, + { + "country": "英国", + "ratio": "18%" + } + ] + } + ] + } + """), + @ExampleObject( + name = "店铺完成示例", + summary = "最后一片提交完成后，将 shopDone 置为 true", + value = """ + { + "shops": [ + { + "shopName": "郭亚芳", + "submissionId": "query-asin:3089:郭亚芳:1711111111111", + "chunkIndex": 2, + "chunkTotal": 2, + "shopDone": true, + "countrySections": [ + { + "country": "法国", + "rows": [ + { + "status": "正常", + "quantity": "4", + "deleteQuantity": "0", + "processStatus": "已完成" + } + ] + } + ], + "cartRatios": [ + { + "country": "法国", + "ratio": "12%" + } + ] + } + ] + } + """), + @ExampleObject( + name = "失败示例", + summary = "店铺处理失败时直接回传错误信息", + value = """ + { + "shops": [ + { + "shopName": "郭亚芳", + "shopDone": true, + "error": "紫鸟页面加载超时，未能完成删除数据采集" + } + ] + } + """) + })) + @Valid @RequestBody QueryAsinSubmitResultRequest request, + jakarta.servlet.http.HttpServletResponse response) { + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + response.setContentType("application/json;charset=UTF-8"); + queryAsinTaskService.submitResult(taskId, request); + return ApiResponse.success(null); + } + + @GetMapping("/results/{resultId}/download") + @Operation(summary = "下载结果文件", description = "按结果记录下载服务端已生成并上传到 OSS 的查询ASIN Excel 文件。") + public void downloadResult( + @Parameter(description = "结果记录主键", example = "4599") + @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId, + jakarta.servlet.http.HttpServletResponse response) { + String url = queryAsinTaskService.resolveResultDownloadUrl(resultId, userId); + String filename = queryAsinTaskService.resolveResultDownloadFilename(resultId, userId); + if (url == null || url.isBlank()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果"); + } + try { + String encodedFilename = URLEncoder.encode(filename, StandardCharsets.UTF_8).replace("+", "%20"); + response.setContentType("application/octet-stream"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, + "attachment; filename=\"" + filename + "\"; filename*=UTF-8''" + encodedFilename); + try (InputStream in = URI.create(url).toURL().openStream()) { + byte[] buffer = new byte[65536]; + int read; + while ((read = in.read(buffer)) != -1) { + response.getOutputStream().write(buffer, 0, read); + } + response.getOutputStream().flush(); + } + } catch (Exception ex) { + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "下载失败"); + } + } + + @DeleteMapping("/tasks/{taskId}") + @Operation(summary = "删除任务", description = "删除整条查询ASIN任务以及该任务下关联的所有结果记录。") + public ApiResponse deleteTask( + @Parameter(description = "任务主键", example = "3089") + @PathVariable Long taskId, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId) { + queryAsinTaskService.deleteTask(taskId, userId); + return ApiResponse.success(null); + } + + @DeleteMapping("/history/{resultId}") + @Operation(summary = "删除单条历史记录", description = "删除一条查询ASIN结果记录，并同步重算其所属任务状态。") + public ApiResponse deleteHistory( + @Parameter(description = "结果记录主键", example = "4599") + @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") + @RequestParam("user_id") Long userId) { + queryAsinTaskService.deleteHistory(resultId, userId); + return ApiResponse.success(null); + } +} + + + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/mapper/QueryAsinShopCandidateMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/mapper/QueryAsinShopCandidateMapper.java new file mode 100644 index 0000000..4b0a598 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/mapper/QueryAsinShopCandidateMapper.java @@ -0,0 +1,10 @@ +package com.nanri.aiimage.modules.queryasin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.queryasin.model.entity.QueryAsinShopCandidateEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface QueryAsinShopCandidateMapper extends BaseMapper { +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCartRatioDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCartRatioDto.java new file mode 100644 index 0000000..7b5e5a3 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCartRatioDto.java @@ -0,0 +1,16 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "购物车比例数据") +public class QueryAsinCartRatioDto { + + @Schema(description = "国家名称", example = "德国") + private String country; + + @Schema(description = "购物车比例", example = "25%") + private String ratio; +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryAsinsDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryAsinsDto.java new file mode 100644 index 0000000..99deac9 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryAsinsDto.java @@ -0,0 +1,18 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "查询 ASIN 国家维度 ASIN 列表") +public class QueryAsinCountryAsinsDto { + + @Schema(description = "国家编码，支持 DE、UK、FR、IT、ES", example = "DE") + private String country; + + @Schema(description = "该国家需要查询的 ASIN 列表") + private List asins = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryMetricRowDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryMetricRowDto.java new file mode 100644 index 0000000..8be4dfa --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountryMetricRowDto.java @@ -0,0 +1,25 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "国家状态数据中的单行记录") +public class QueryAsinCountryMetricRowDto { + + @Schema(description = "商品状态", example = "正常") + private String status; + + @Schema(description = "该状态下的商品数量", example = "12") + private String quantity; + + @JsonProperty("deleteQuantity") + @Schema(description = "已删除数量", example = "3") + private String deleteQuantity; + + @JsonProperty("processStatus") + @Schema(description = "处理结果或处理状态", example = "处理中") + private String processStatus; +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountrySectionDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountrySectionDto.java new file mode 100644 index 0000000..903d538 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCountrySectionDto.java @@ -0,0 +1,19 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "单个国家的状态数据分组") +public class QueryAsinCountrySectionDto { + + @Schema(description = "国家名称", example = "德国") + private String country; + + @Schema(description = "该国家下的多行状态数据") + private List rows = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCreateTaskRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCreateTaskRequest.java new file mode 100644 index 0000000..cc72b82 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinCreateTaskRequest.java @@ -0,0 +1,27 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "创建查询ASIN任务请求") +public class QueryAsinCreateTaskRequest { + + @NotNull + @JsonProperty("user_id") + @Schema(description = "当前用户 ID", example = "1", requiredMode = Schema.RequiredMode.REQUIRED) + private Long userId; + + @Valid + @NotEmpty + @Schema(description = "待创建的店铺任务列表，通常由已匹配成功的店铺组成", requiredMode = Schema.RequiredMode.REQUIRED) + private List items = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinShopPayloadDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinShopPayloadDto.java new file mode 100644 index 0000000..de9ad04 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinShopPayloadDto.java @@ -0,0 +1,49 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "单个店铺的查询ASIN结果分片") +public class QueryAsinShopPayloadDto { + + @JsonProperty("shopName") + @Schema(description = "店铺名称，服务端按店铺名称聚合分片", example = "郭亚芳") + private String shopName; + + @Schema(description = "店铺处理失败时的错误信息；有值时该店铺会直接标记失败", example = "紫鸟页面加载超时，未能完成删除数据采集") + private String error; + + @JsonProperty("countrySections") + @Schema(description = "各国家的状态数据列表。同一国家可分多片提交，服务端会按顺序合并") + private List countrySections = new ArrayList<>(); + + @JsonProperty("cartRatios") + @Schema(description = "购物车比例数据列表，通常只在店铺首行展示") + private List cartRatios = new ArrayList<>(); + + @JsonProperty("queryAsins") + @Schema(description = "Python 回传的查询 ASIN 结果分片；如果 Python 仅透传后台 ASIN，也按该字段提交") + private List queryAsins = new ArrayList<>(); + + @JsonProperty("shopDone") + @Schema(description = "该店铺是否已全部提交完成。最后一片应传 true", example = "true") + private Boolean shopDone; + + @JsonProperty("submissionId") + @Schema(description = "本次店铺提交批次标识，便于问题排查与日志跟踪", example = "query-asin:3089:郭亚芳:1711111111111") + private String submissionId; + + @JsonProperty("chunkIndex") + @Schema(description = "当前分片序号，建议从 1 开始", example = "1") + private Integer chunkIndex; + + @JsonProperty("chunkTotal") + @Schema(description = "当前店铺总分片数", example = "2") + private Integer chunkTotal; +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinSubmitResultRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinSubmitResultRequest.java new file mode 100644 index 0000000..96d0cf1 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinSubmitResultRequest.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "查询ASIN结果回传请求") +public class QueryAsinSubmitResultRequest { + + @Valid + @NotEmpty + @Schema(description = "本次提交的店铺结果分片列表，支持一次提交多个店铺", requiredMode = Schema.RequiredMode.REQUIRED) + private List shops = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskBatchRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskBatchRequest.java new file mode 100644 index 0000000..81177db --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskBatchRequest.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class QueryAsinTaskBatchRequest { + + @NotEmpty(message = "taskIds 不能为空") + private List taskIds = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskItemDto.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskItemDto.java new file mode 100644 index 0000000..54a4c81 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/dto/QueryAsinTaskItemDto.java @@ -0,0 +1,45 @@ +package com.nanri.aiimage.modules.queryasin.model.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@Schema(description = "查询ASIN任务中的单个店铺项") +public class QueryAsinTaskItemDto { + + @JsonProperty("shopName") + @Schema(description = "店铺名称", example = "郭亚芳") + private String shopName; + + @Schema(description = "该店铺是否已完成紫鸟匹配，创建任务时必须为 true", example = "true") + private boolean matched; + + @JsonProperty("shopId") + @Schema(description = "匹配到的紫鸟店铺 ID", example = "27730548558377") + private String shopId; + + @Schema(description = "店铺所属平台", example = "亚马逊") + private String platform; + + @JsonProperty("companyName") + @Schema(description = "店铺所属公司名称", example = "示例公司") + private String companyName; + + @JsonProperty("matchStatus") + @Schema(description = "匹配状态，例如 MATCHED、PENDING、CONFLICT、INDEX_STALE", example = "MATCHED") + private String matchStatus; + + @JsonProperty("matchMessage") + @Schema(description = "匹配状态说明", example = "索引已命中") + private String matchMessage; + + @Valid + @JsonProperty("queryAsins") + @Schema(description = "后台查询 ASIN 维护表中的国家 ASIN 列表；查询ASIN任务按全表返回，不按店铺过滤") + private List queryAsins = new ArrayList<>(); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/entity/QueryAsinShopCandidateEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/entity/QueryAsinShopCandidateEntity.java new file mode 100644 index 0000000..2233113 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/entity/QueryAsinShopCandidateEntity.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.modules.queryasin.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("biz_query_asin_shop_candidate") +public class QueryAsinShopCandidateEntity { + + @TableId(type = IdType.AUTO) + private Long id; + private Long userId; + private String shopName; + private LocalDateTime createdAt; +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinCreateTaskVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinCreateTaskVo.java new file mode 100644 index 0000000..c251f6a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinCreateTaskVo.java @@ -0,0 +1,14 @@ +package com.nanri.aiimage.modules.queryasin.model.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class QueryAsinCreateTaskVo { + + private Long taskId; + private List items = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinHistoryVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinHistoryVo.java new file mode 100644 index 0000000..ebebce8 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinHistoryVo.java @@ -0,0 +1,13 @@ +package com.nanri.aiimage.modules.queryasin.model.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class QueryAsinHistoryVo { + + private List items = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinResultItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinResultItemVo.java new file mode 100644 index 0000000..a9bb3b3 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinResultItemVo.java @@ -0,0 +1,57 @@ +package com.nanri.aiimage.modules.queryasin.model.vo; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCartRatioDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryAsinsDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountrySectionDto; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Data +public class QueryAsinResultItemVo { + + private Long resultId; + private Long taskId; + + @JsonProperty("shopName") + private String shopName; + + @JsonProperty("shopId") + private String shopId; + + private String platform; + + @JsonProperty("companyName") + private String companyName; + + private boolean matched; + + @JsonProperty("matchStatus") + private String matchStatus; + + @JsonProperty("matchMessage") + private String matchMessage; + + @JsonProperty("taskStatus") + private String taskStatus; + + private Boolean success; + private String error; + private LocalDateTime createdAt; + private LocalDateTime finishedAt; + private String outputFilename; + private String downloadUrl; + + @JsonProperty("countrySections") + private List countrySections = new ArrayList<>(); + + @JsonProperty("cartRatios") + private List cartRatios = new ArrayList<>(); + + @JsonProperty("queryAsins") + private List queryAsins = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinTaskBatchVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinTaskBatchVo.java new file mode 100644 index 0000000..0bc2ed6 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/model/vo/QueryAsinTaskBatchVo.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.modules.queryasin.model.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class QueryAsinTaskBatchVo { + + private List items = new ArrayList<>(); + + private List missingTaskIds = new ArrayList<>(); +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java new file mode 100644 index 0000000..3cb680a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinExcelAssemblyService.java @@ -0,0 +1,112 @@ +package com.nanri.aiimage.modules.queryasin.service; + +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryAsinsDto; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinResultItemVo; +import lombok.extern.slf4j.Slf4j; +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.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class QueryAsinExcelAssemblyService { + + private static final List COUNTRIES = List.of("DE", "UK", "FR", "IT", "ES"); + private static final String[] HEADER = {"店铺名", "德国", "英国", "法国", "意大利", "西班牙"}; + + 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("查询ASIN结果"); + Row headerRow = sheet.createRow(0); + for (int columnIndex = 0; columnIndex < HEADER.length; columnIndex++) { + headerRow.createCell(columnIndex).setCellValue(HEADER[columnIndex]); + sheet.setColumnWidth(columnIndex, (columnIndex == 0 ? 22 : 18) * 256); + } + + int rowIndex = 1; + for (QueryAsinResultItemVo item : items) { + if (item == null || Boolean.FALSE.equals(item.getSuccess())) { + continue; + } + Map> asinsByCountry = asinsByCountry(item.getQueryAsins()); + int maxRows = maxRows(asinsByCountry); + for (int i = 0; i < maxRows; i++) { + Row row = sheet.createRow(rowIndex++); + row.createCell(0).setCellValue(i == 0 ? safe(item.getShopName()) : ""); + for (int c = 0; c < COUNTRIES.size(); c++) { + List asins = asinsByCountry.get(COUNTRIES.get(c)); + row.createCell(c + 1).setCellValue(asins != null && i < asins.size() ? safe(asins.get(i)) : ""); + } + } + rowIndex++; + } + workbook.write(outputStream); + } catch (Exception ex) { + log.warn("[query-asin] write workbook failed: {}", ex.getMessage()); + throw new BusinessException("generate query-asin excel failed: " + ex.getMessage()); + } finally { + try { + workbook.close(); + } catch (Exception ignored) { + } + workbook.dispose(); + } + } + + public int countRows(List items) { + int count = 0; + if (items == null) { + return 0; + } + for (QueryAsinResultItemVo item : items) { + if (item != null && !Boolean.FALSE.equals(item.getSuccess())) { + count += maxRows(asinsByCountry(item.getQueryAsins())); + } + } + return count; + } + + private Map> asinsByCountry(List queryAsins) { + Map> map = new LinkedHashMap<>(); + for (String country : COUNTRIES) { + map.put(country, List.of()); + } + if (queryAsins == null) { + return map; + } + for (QueryAsinCountryAsinsDto item : queryAsins) { + if (item == null || item.getCountry() == null) { + continue; + } + String country = item.getCountry().trim().toUpperCase(); + if (map.containsKey(country)) { + map.put(country, item.getAsins() == null ? List.of() : item.getAsins()); + } + } + return map; + } + + private int maxRows(Map> asinsByCountry) { + int max = 1; + for (List asins : asinsByCountry.values()) { + if (asins != null && asins.size() > max) { + max = asins.size(); + } + } + return max; + } + + private String safe(String value) { + return value == null ? "" : value; + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java new file mode 100644 index 0000000..d57234c --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinResolveService.java @@ -0,0 +1,221 @@ +package com.nanri.aiimage.modules.queryasin.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskCandidateAddRequest; +import com.nanri.aiimage.modules.productrisk.model.dto.ProductRiskMatchShopsRequest; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskCandidateVo; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskMatchShopsVo; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskShopQueueItemVo; +import com.nanri.aiimage.modules.queryasin.mapper.QueryAsinShopCandidateMapper; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryAsinsDto; +import com.nanri.aiimage.modules.queryasin.model.entity.QueryAsinShopCandidateEntity; +import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper; +import com.nanri.aiimage.modules.shopkey.model.entity.QueryAsinEntity; +import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopMatchResultVo; +import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopIndexService; +import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@Service +@RequiredArgsConstructor +public class QueryAsinResolveService { + + private final QueryAsinShopCandidateMapper candidateMapper; + private final ZiniaoShopSwitchService ziniaoShopSwitchService; + private final QueryAsinMapper queryAsinMapper; + + public List listCandidates(Long userId) { + validateUserId(userId); + List rows = candidateMapper.selectList( + new LambdaQueryWrapper() + .eq(QueryAsinShopCandidateEntity::getUserId, userId) + .orderByDesc(QueryAsinShopCandidateEntity::getId)); + List list = new ArrayList<>(); + for (QueryAsinShopCandidateEntity row : rows) { + ProductRiskCandidateVo vo = new ProductRiskCandidateVo(); + vo.setId(row.getId()); + vo.setShopName(row.getShopName()); + vo.setCreatedAt(row.getCreatedAt()); + list.add(vo); + } + return list; + } + + @Transactional + public ProductRiskCandidateVo addCandidate(ProductRiskCandidateAddRequest request) { + validateUserId(request.getUserId()); + String normalized = ziniaoShopSwitchService.normalizeShopName(request.getShopName()); + if (normalized.isBlank()) { + throw new BusinessException("店铺名不能为空"); + } + ZiniaoShopMatchResultVo indexHit = ziniaoShopSwitchService.findIndexedStoreByName(normalized, false); + if (indexHit == null || !indexHit.isMatched()) { + String hint = indexHit != null && indexHit.getMatchMessage() != null && !indexHit.getMatchMessage().isBlank() + ? indexHit.getMatchMessage() + : "店铺索引未命中，无法加入备选区"; + throw new BusinessException(hint); + } + if (ZiniaoShopIndexService.MATCH_STATUS_CONFLICT.equals(indexHit.getMatchStatus())) { + throw new BusinessException(indexHit.getMatchMessage() != null ? indexHit.getMatchMessage() : "存在多个同名店铺，请人工确认"); + } + QueryAsinShopCandidateEntity existing = candidateMapper.selectOne( + new LambdaQueryWrapper() + .eq(QueryAsinShopCandidateEntity::getUserId, request.getUserId()) + .eq(QueryAsinShopCandidateEntity::getShopName, normalized) + .last("limit 1")); + if (existing != null) { + ProductRiskCandidateVo vo = new ProductRiskCandidateVo(); + vo.setId(existing.getId()); + vo.setShopName(existing.getShopName()); + vo.setCreatedAt(existing.getCreatedAt()); + return vo; + } + QueryAsinShopCandidateEntity entity = new QueryAsinShopCandidateEntity(); + entity.setUserId(request.getUserId()); + entity.setShopName(normalized); + entity.setCreatedAt(LocalDateTime.now()); + candidateMapper.insert(entity); + + ProductRiskCandidateVo vo = new ProductRiskCandidateVo(); + vo.setId(entity.getId()); + vo.setShopName(entity.getShopName()); + vo.setCreatedAt(entity.getCreatedAt()); + return vo; + } + + @Transactional + public void deleteCandidate(Long userId, Long id) { + validateUserId(userId); + if (id == null || id <= 0) { + throw new BusinessException("id 不合法"); + } + QueryAsinShopCandidateEntity row = candidateMapper.selectById(id); + if (row == null || !userId.equals(row.getUserId())) { + throw new BusinessException("记录不存在"); + } + candidateMapper.deleteById(id); + } + + public ProductRiskMatchShopsVo matchShops(ProductRiskMatchShopsRequest request) { + validateUserId(request.getUserId()); + LinkedHashSet ordered = new LinkedHashSet<>(); + for (String raw : request.getShopNames()) { + String normalized = ziniaoShopSwitchService.normalizeShopName(raw); + if (!normalized.isBlank()) { + ordered.add(normalized); + } + } + if (ordered.isEmpty()) { + throw new BusinessException("shop_names 无有效店铺名"); + } + ProductRiskMatchShopsVo vo = new ProductRiskMatchShopsVo(); + for (String shopName : ordered) { + vo.getItems().add(matchOneShop(request.getUserId(), shopName)); + } + return vo; + } + + public List loadQueryAsinsForShop(Long userId, String shopName) { + validateUserId(userId); + String normalizedShopName = ziniaoShopSwitchService.normalizeShopName(shopName); + if (normalizedShopName.isBlank()) { + return List.of(); + } + List rows = queryAsinMapper.selectList( + new LambdaQueryWrapper().orderByAsc(QueryAsinEntity::getId)); + return toCountryAsins(rows); + } + + public long countCandidates(Long userId) { + validateUserId(userId); + Long count = candidateMapper.selectCount(new LambdaQueryWrapper() + .eq(QueryAsinShopCandidateEntity::getUserId, userId)); + return count == null ? 0L : count; + } + + private ProductRiskShopQueueItemVo matchOneShop(Long userId, String shopName) { + ProductRiskShopQueueItemVo item = new ProductRiskShopQueueItemVo(); + item.setShopName(shopName); + try { + ZiniaoShopMatchResultVo matched = ziniaoShopSwitchService.findIndexedStoreByName(shopName, false); + if (matched == null) { + item.setMatched(false); + item.setMatchStatus("PENDING"); + item.setMatchMessage("匹配结果为空"); + return item; + } + item.setMatched(matched.isMatched()); + item.setShopId(matched.getShopId()); + item.setPlatform(matched.getPlatform()); + item.setCompanyName(matched.getCompanyName()); + item.setMatchedUserId(matched.getMatchedUserId()); + item.setMatchStatus(matched.getMatchStatus()); + item.setMatchMessage(matched.getMatchMessage()); + item.setOpenStoreUrl(matched.getOpenStoreUrl()); + item.setQueryAsins(loadQueryAsinsForShop(userId, shopName)); + if (item.isMatched() && item.getQueryAsins().isEmpty()) { + item.setMatchMessage("紫鸟已匹配，但后台查询 ASIN 表暂无数据"); + } + } catch (BusinessException ex) { + item.setMatched(false); + item.setMatchStatus("PENDING"); + item.setMatchMessage(ex.getMessage()); + } catch (Exception ex) { + item.setMatched(false); + item.setMatchStatus("PENDING"); + item.setMatchMessage(Objects.toString(ex.getMessage(), "匹配异常")); + } + return item; + } + + private List toCountryAsins(List rows) { + Map> asinsByCountry = new LinkedHashMap<>(); + for (String country : List.of("DE", "UK", "FR", "IT", "ES")) { + asinsByCountry.put(country, new LinkedHashSet<>()); + } + if (rows != null) { + for (QueryAsinEntity row : rows) { + addAsin(asinsByCountry, "DE", row.getAsinDe()); + addAsin(asinsByCountry, "UK", row.getAsinUk()); + addAsin(asinsByCountry, "FR", row.getAsinFr()); + addAsin(asinsByCountry, "IT", row.getAsinIt()); + addAsin(asinsByCountry, "ES", row.getAsinEs()); + } + } + List out = new ArrayList<>(); + for (Map.Entry> entry : asinsByCountry.entrySet()) { + if (entry.getValue().isEmpty()) { + continue; + } + QueryAsinCountryAsinsDto dto = new QueryAsinCountryAsinsDto(); + dto.setCountry(entry.getKey()); + dto.setAsins(new ArrayList<>(entry.getValue())); + out.add(dto); + } + return out; + } + + private void addAsin(Map> map, String country, String asin) { + String normalized = asin == null ? "" : asin.trim().toUpperCase(); + if (!normalized.isEmpty()) { + map.get(country).add(normalized); + } + } + + private void validateUserId(Long userId) { + if (userId == null || userId <= 0) { + throw new BusinessException("user_id 不合法"); + } + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskCacheService.java new file mode 100644 index 0000000..4c8c4db --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskCacheService.java @@ -0,0 +1,168 @@ +package com.nanri.aiimage.modules.queryasin.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.config.TaskPressureProperties; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinShopPayloadDto; +import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; +import com.nanri.aiimage.modules.task.service.TaskScopePayloadStorageService; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.time.Instant; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Service +@RequiredArgsConstructor +public class QueryAsinTaskCacheService { + + private static final String MODULE_TYPE = "QUERY_ASIN"; + private static final long PAYLOAD_TTL_HOURS = 24; + private final StringRedisTemplate stringRedisTemplate; + private final ObjectMapper objectMapper; + private final TaskPressureProperties taskPressureProperties; + private final TaskScopePayloadStorageService taskScopePayloadStorageService; + private final ConcurrentHashMap taskEntityLocalCache = new ConcurrentHashMap<>(); + + public QueryAsinShopPayloadDto getShopMergedPayload(Long taskId, String shopKey) { + return taskScopePayloadStorageService.getScopePayload(taskId, MODULE_TYPE, shopKey, QueryAsinShopPayloadDto.class); + } + + public void saveShopMergedPayload(Long taskId, String shopKey, QueryAsinShopPayloadDto payload) { + if (taskId == null || taskId <= 0 || shopKey == null || shopKey.isBlank() || payload == null) { + return; + } + taskScopePayloadStorageService.saveScopePayload(taskId, MODULE_TYPE, shopKey, payload); + touchTaskHeartbeat(taskId); + } + + public void removeShopMergedPayload(Long taskId, String shopKey) { + taskScopePayloadStorageService.removeScopePayload(taskId, MODULE_TYPE, shopKey); + } + + public Map getAllShopMergedPayload(Long taskId) { + return taskScopePayloadStorageService.getAllScopePayload(taskId, MODULE_TYPE, QueryAsinShopPayloadDto.class); + } + + public boolean hasAnyShopMergedPayload(Long taskId) { + return taskScopePayloadStorageService.hasAnyScopePayload(taskId, MODULE_TYPE); + } + + public long countShopMergedPayload(Long taskId) { + return taskScopePayloadStorageService.countScopePayload(taskId, MODULE_TYPE); + } + + public long getTaskHeartbeatMillis(Long taskId) { + if (taskId == null || taskId <= 0) { + return 0L; + } + String raw = stringRedisTemplate.opsForValue().get(buildTaskHeartbeatKey(taskId)); + if (raw == null || raw.isBlank()) { + return 0L; + } + try { + return Long.parseLong(raw); + } catch (NumberFormatException ignored) { + return 0L; + } + } + + public void touchTaskHeartbeat(Long taskId) { + stringRedisTemplate.opsForValue().set( + buildTaskHeartbeatKey(taskId), + String.valueOf(Instant.now().toEpochMilli()), + Duration.ofHours(PAYLOAD_TTL_HOURS)); + } + + public void deleteTaskCache(Long taskId) { + if (taskId == null || taskId <= 0) { + return; + } + taskEntityLocalCache.remove(taskId); + stringRedisTemplate.delete(buildTaskHeartbeatKey(taskId)); + stringRedisTemplate.delete(buildTaskEntityKey(taskId)); + taskScopePayloadStorageService.deleteTaskScopePayloads(taskId, MODULE_TYPE); + } + + public void saveTaskCache(FileTaskEntity task) { + if (task == null || task.getId() == null) { + return; + } + long now = System.currentTimeMillis(); + taskEntityLocalCache.put(task.getId(), new LocalTaskEntityCacheEntry( + now, + objectMapper.convertValue(task, FileTaskEntity.class) + )); + try { + stringRedisTemplate.opsForValue().set( + buildTaskEntityKey(task.getId()), + objectMapper.writeValueAsString(task), + Duration.ofHours(PAYLOAD_TTL_HOURS) + ); + } catch (Exception ignored) { + } + } + + public Map getTaskCacheBatch(java.util.List taskIds) { + Map result = new LinkedHashMap<>(); + if (taskIds == null || taskIds.isEmpty()) { + return result; + } + java.util.List normalized = taskIds.stream() + .filter(id -> id != null && id > 0) + .distinct() + .toList(); + if (normalized.isEmpty()) { + return result; + } + long now = System.currentTimeMillis(); + java.util.List missingIds = new ArrayList<>(); + for (Long taskId : normalized) { + LocalTaskEntityCacheEntry cached = taskEntityLocalCache.get(taskId); + if (isLocalCacheFresh(cached, now)) { + result.put(taskId, objectMapper.convertValue(cached.task(), FileTaskEntity.class)); + } else { + missingIds.add(taskId); + } + } + if (missingIds.isEmpty()) { + return result; + } + java.util.List keys = missingIds.stream().map(this::buildTaskEntityKey).toList(); + java.util.List values = stringRedisTemplate.opsForValue().multiGet(keys); + for (int i = 0; i < missingIds.size(); i++) { + Long taskId = missingIds.get(i); + String val = values != null && i < values.size() ? values.get(i) : null; + if (val == null || val.isBlank()) { + continue; + } + try { + FileTaskEntity task = objectMapper.readValue(val, FileTaskEntity.class); + result.put(taskId, task); + taskEntityLocalCache.put(taskId, new LocalTaskEntityCacheEntry(now, task)); + } catch (Exception ignored) { + } + } + return result; + } + + private String buildTaskHeartbeatKey(Long taskId) { + return "query-asin:task:heartbeat:" + taskId; + } + + private String buildTaskEntityKey(Long taskId) { + return "query-asin:task:entity:" + taskId; + } + + private boolean isLocalCacheFresh(LocalTaskEntityCacheEntry cached, long now) { + return cached != null + && now - cached.cachedAtMillis() <= Math.max(0L, taskPressureProperties.getLocalTaskEntityCacheMillis()); + } + + private record LocalTaskEntityCacheEntry(long cachedAtMillis, FileTaskEntity task) {} +} + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java new file mode 100644 index 0000000..27eee63 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java @@ -0,0 +1,960 @@ +package com.nanri.aiimage.modules.queryasin.service; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.config.TaskPressureProperties; +import com.nanri.aiimage.modules.file.service.oss.OssStorageService; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCartRatioDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryAsinsDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountryMetricRowDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCountrySectionDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinCreateTaskRequest; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinShopPayloadDto; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinSubmitResultRequest; +import com.nanri.aiimage.modules.queryasin.model.dto.QueryAsinTaskItemDto; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinTaskBatchVo; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinCreateTaskVo; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinHistoryVo; +import com.nanri.aiimage.modules.queryasin.model.vo.QueryAsinResultItemVo; +import com.nanri.aiimage.modules.productrisk.model.vo.ProductRiskDashboardVo; +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 com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.File; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@Service +@RequiredArgsConstructor +@Slf4j +public class QueryAsinTaskService { + + private static final String MODULE_TYPE = "QUERY_ASIN"; + private static final String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + private static final String INTERRUPTED_MESSAGE = "Python 在该店铺结果提交完成前中断"; + + private final FileTaskMapper fileTaskMapper; + private final FileResultMapper fileResultMapper; + private final QueryAsinResolveService queryAsinResolveService; + private final QueryAsinExcelAssemblyService excelAssemblyService; + private final QueryAsinTaskCacheService taskCacheService; + private final OssStorageService ossStorageService; + private final ZiniaoShopSwitchService ziniaoShopSwitchService; + private final ObjectMapper objectMapper; + private final TaskPressureProperties taskPressureProperties; + + 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; + } + + private Map loadTaskMapByIds(List taskIds) { + Map result = new LinkedHashMap<>(); + if (taskIds == null || taskIds.isEmpty()) { + return result; + } + List normalizedTaskIds = taskIds.stream() + .filter(taskId -> taskId != null && taskId > 0) + .distinct() + .toList(); + if (normalizedTaskIds.isEmpty()) { + return result; + } + Map cachedTasks = taskCacheService.getTaskCacheBatch(normalizedTaskIds); + result.putAll(cachedTasks); + List missingTaskIds = normalizedTaskIds.stream() + .filter(taskId -> !cachedTasks.containsKey(taskId)) + .toList(); + if (!missingTaskIds.isEmpty()) { + for (FileTaskEntity dbTask : selectTasksByIdsInBatches(missingTaskIds)) { + if (dbTask == null || !MODULE_TYPE.equals(dbTask.getModuleType())) { + continue; + } + result.put(dbTask.getId(), dbTask); + if ("RUNNING".equals(dbTask.getStatus())) { + taskCacheService.saveTaskCache(dbTask); + } + } + } + return result; + } + + 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; + } + + public ProductRiskDashboardVo dashboard(Long userId) { + validateUserId(userId); + ProductRiskDashboardVo vo = new ProductRiskDashboardVo(); + vo.setCandidateCount(queryAsinResolveService.countCandidates(userId)); + vo.setProcessedTaskCount(countTasks(userId, List.of("SUCCESS", "FAILED"))); + vo.setSuccessTaskCount(countTasks(userId, List.of("SUCCESS"))); + vo.setFailedTaskCount(countTasks(userId, List.of("FAILED"))); + return vo; + } + + public QueryAsinHistoryVo listHistory(Long userId) { + validateUserId(userId); + QueryAsinHistoryVo vo = new QueryAsinHistoryVo(); + List entities = fileResultMapper.selectList(new LambdaQueryWrapper() + .eq(FileResultEntity::getModuleType, MODULE_TYPE) + .eq(FileResultEntity::getUserId, userId) + .orderByDesc(FileResultEntity::getCreatedAt) + .last("limit 100")); + if (entities.isEmpty()) { + vo.setItems(List.of()); + return vo; + } + + Map taskMap = loadTaskMap(entities); + Map> snapshotMap = buildSnapshotMap(taskMap); + List items = new ArrayList<>(); + for (FileResultEntity entity : entities) { + FileTaskEntity task = taskMap.get(entity.getTaskId()); + QueryAsinResultItemVo snapshot = snapshotMap.getOrDefault(entity.getTaskId(), Map.of()).get(entity.getId()); + items.add(toHistoryItem(entity, task, snapshot)); + } + vo.setItems(items); + return vo; + } + + public QueryAsinTaskBatchVo getTaskProgressBatch(List taskIds) { + QueryAsinTaskBatchVo batch = new QueryAsinTaskBatchVo(); + if (taskIds == null || taskIds.isEmpty()) { + return batch; + } + + List normalizedTaskIds = taskIds.stream() + .filter(taskId -> taskId != null && taskId > 0) + .distinct() + .limit(50) + .toList(); + if (normalizedTaskIds.isEmpty()) { + return batch; + } + + Map taskMap = loadTaskMapByIds(normalizedTaskIds); + List rows = fileResultMapper.selectList(new LambdaQueryWrapper() + .eq(FileResultEntity::getModuleType, MODULE_TYPE) + .in(FileResultEntity::getTaskId, normalizedTaskIds) + .orderByAsc(FileResultEntity::getId)); + Map> rowsByTaskId = new LinkedHashMap<>(); + for (FileResultEntity row : rows) { + rowsByTaskId.computeIfAbsent(row.getTaskId(), ignored -> new ArrayList<>()).add(row); + } + + for (Long taskId : normalizedTaskIds) { + FileTaskEntity task = taskMap.get(taskId); + if (task == null) { + batch.getMissingTaskIds().add(taskId); + continue; + } + List taskRows = rowsByTaskId.get(taskId); + if (taskRows == null || taskRows.isEmpty()) { + batch.getMissingTaskIds().add(taskId); + continue; + } + List snapshots = buildSnapshotFromDb(task, taskRows); + batch.getItems().addAll(snapshots); + } + return batch; + } + + public String resolveResultDownloadUrl(Long resultId, Long userId) { + FileResultEntity entity = fileResultMapper.selectById(resultId); + if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { + throw new BusinessException("记录不存在"); + } + if (blank(entity.getResultFileUrl())) { + throw new BusinessException("暂无可下载文件"); + } + return ossStorageService.generateFreshDownloadUrl(entity.getResultFileUrl()); + } + + public String resolveResultDownloadFilename(Long resultId, Long userId) { + FileResultEntity entity = fileResultMapper.selectById(resultId); + if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { + throw new BusinessException("记录不存在"); + } + return !blank(entity.getResultFilename()) + ? entity.getResultFilename() + : safeFileStem(entity.getSourceFilename()) + ".xlsx"; + } + + @Transactional + public QueryAsinCreateTaskVo createTask(QueryAsinCreateTaskRequest request) { + validateUserId(request.getUserId()); + if (request.getItems() == null || request.getItems().isEmpty()) { + throw new BusinessException("items 不能为空"); + } + + List uniqueItems = dedupeItems(request.getItems()); + if (uniqueItems.isEmpty()) { + throw new BusinessException("items 不能为空"); + } + for (QueryAsinTaskItemDto item : uniqueItems) { + if (item == null || !item.isMatched()) { + throw new BusinessException("存在未匹配店铺，无法创建任务"); + } + if (item.getQueryAsins() == null || item.getQueryAsins().isEmpty()) { + item.setQueryAsins(queryAsinResolveService.loadQueryAsinsForShop(request.getUserId(), item.getShopName())); + } + if (item.getQueryAsins() == null || item.getQueryAsins().isEmpty()) { + throw new BusinessException("后台查询 ASIN 表暂无数据，无法创建任务"); + } + } + + LocalDateTime now = LocalDateTime.now(); + FileTaskEntity task = new FileTaskEntity(); + task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr()); + task.setModuleType(MODULE_TYPE); + task.setTaskMode("PYTHON_QUEUE"); + task.setStatus("RUNNING"); + task.setSourceFileCount(uniqueItems.size()); + task.setSuccessFileCount(0); + task.setFailedFileCount(0); + task.setCreatedBy("user:" + request.getUserId()); + task.setUserId(request.getUserId()); + task.setCreatedAt(now); + task.setUpdatedAt(now); + fileTaskMapper.insert(task); + taskCacheService.saveTaskCache(task); + taskCacheService.touchTaskHeartbeat(task.getId()); + + List snapshots = new ArrayList<>(); + for (QueryAsinTaskItemDto item : uniqueItems) { + String normalizedShopName = ziniaoShopSwitchService.normalizeShopName(item.getShopName()); + if (blank(normalizedShopName)) { + throw new BusinessException("任务数据已失效，请刷新后重试"); + } + FileResultEntity result = new FileResultEntity(); + result.setTaskId(task.getId()); + result.setModuleType(MODULE_TYPE); + result.setSourceFilename(normalizedShopName); + result.setSourceFileUrl(item.getShopId()); + result.setUserId(request.getUserId()); + result.setSuccess(null); + result.setCreatedAt(now); + fileResultMapper.insert(result); + snapshots.add(toSnapshotVo(result, item, task.getStatus(), null)); + } + persistTaskJson(task, uniqueItems, snapshots); + + QueryAsinCreateTaskVo vo = new QueryAsinCreateTaskVo(); + vo.setTaskId(task.getId()); + vo.setItems(snapshots); + return vo; + } + + @Transactional + public void submitResult(Long taskId, QueryAsinSubmitResultRequest request) { + if (taskId == null || taskId <= 0) { + throw new BusinessException("taskId 不合法"); + } + if (request == null || request.getShops() == null || request.getShops().isEmpty()) { + throw new BusinessException("shops 不能为空"); + } + + FileTaskEntity task = loadTaskForExecution(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + throw new BusinessException("任务不存在"); + } + if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { + throw new BusinessException("任务已结束，拒绝重复提交"); + } + + taskCacheService.touchTaskHeartbeat(taskId); + List resultRows = listTaskRows(taskId); + List snapshots = buildSnapshotFromDb(task, resultRows); + Map snapshotByResultId = indexSnapshotByResultId(snapshots); + Map payloadByShop = normalizePayloadByShop(request.getShops()); + + for (FileResultEntity row : resultRows) { + String shopKey = row.getSourceFilename(); + QueryAsinShopPayloadDto incoming = payloadByShop.get(shopKey); + if (incoming == null) { + continue; + } + QueryAsinShopPayloadDto mergedPayload = mergeShopPayload(taskId, shopKey, incoming); + QueryAsinResultItemVo snapshot = snapshotByResultId.get(row.getId()); + mergePayloadIntoSnapshot(snapshot, mergedPayload); + + if (!blank(mergedPayload.getError())) { + markResultFailed(row, mergedPayload.getError()); + applyFailureToSnapshot(snapshot, mergedPayload.getError()); + taskCacheService.removeShopMergedPayload(taskId, shopKey); + continue; + } + + if (Boolean.TRUE.equals(mergedPayload.getShopDone())) { + markResultSuccess(row); + applySuccessToSnapshot(snapshot); + taskCacheService.removeShopMergedPayload(taskId, shopKey); + } + } + + persistSnapshotJson(task, snapshots); + fileTaskMapper.updateById(task); + tryFinalizeTask(taskId, false); + } + + @Transactional + public boolean tryFinalizeTask(Long taskId, boolean fromCompensation) { + if (taskId == null || taskId <= 0) { + return false; + } + FileTaskEntity task = loadTaskForExecution(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + return false; + } + if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { + return true; + } + + List rows = listTaskRows(taskId); + if (rows.isEmpty()) { + return false; + } + + Map cachedPayloads = taskCacheService.getAllShopMergedPayload(taskId); + List snapshots = buildSnapshotFromDb(task, rows); + Map snapshotByResultId = indexSnapshotByResultId(snapshots); + boolean changed = false; + + for (FileResultEntity row : rows) { + if (isResultFinished(row)) { + continue; + } + QueryAsinResultItemVo snapshot = snapshotByResultId.get(row.getId()); + QueryAsinShopPayloadDto cached = cachedPayloads.get(row.getSourceFilename()); + if (cached == null) { + if (fromCompensation) { + markResultFailed(row, INTERRUPTED_MESSAGE); + applyFailureToSnapshot(snapshot, INTERRUPTED_MESSAGE); + changed = true; + } + continue; + } + + mergePayloadIntoSnapshot(snapshot, cached); + + if (!blank(cached.getError())) { + markResultFailed(row, cached.getError()); + applyFailureToSnapshot(snapshot, cached.getError()); + taskCacheService.removeShopMergedPayload(taskId, row.getSourceFilename()); + changed = true; + continue; + } + + if (Boolean.TRUE.equals(cached.getShopDone()) || (fromCompensation && hasAnyPayloadData(cached))) { + markResultSuccess(row); + applySuccessToSnapshot(snapshot); + taskCacheService.removeShopMergedPayload(taskId, row.getSourceFilename()); + changed = true; + continue; + } + + if (fromCompensation) { + markResultFailed(row, INTERRUPTED_MESSAGE); + applyFailureToSnapshot(snapshot, INTERRUPTED_MESSAGE); + taskCacheService.removeShopMergedPayload(taskId, row.getSourceFilename()); + changed = true; + } + } + + List latestRows = listTaskRows(taskId); + updateTaskStatusFromRows(task, latestRows); + if (latestRows.stream().allMatch(this::isResultFinished)) { + finalizeTaskWorkbook(task, latestRows, snapshots); + return true; + } + + persistSnapshotJson(task, snapshots); + fileTaskMapper.updateById(task); + return changed; + } + + @Transactional + public void deleteTask(Long taskId, Long userId) { + validateUserId(userId); + FileTaskEntity task = loadTaskForExecution(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) { + throw new BusinessException("任务不存在"); + } + fileResultMapper.delete(new LambdaQueryWrapper() + .eq(FileResultEntity::getTaskId, taskId) + .eq(FileResultEntity::getModuleType, MODULE_TYPE)); + fileTaskMapper.deleteById(taskId); + taskCacheService.deleteTaskCache(taskId); + } + + @Transactional + public void deleteHistory(Long resultId, Long userId) { + validateUserId(userId); + FileResultEntity entity = fileResultMapper.selectById(resultId); + if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { + throw new BusinessException("记录不存在"); + } + Long taskId = entity.getTaskId(); + fileResultMapper.deleteById(resultId); + reconcileTaskAfterResultRemoval(taskId); + } + + private void reconcileTaskAfterResultRemoval(Long taskId) { + if (taskId == null || taskId <= 0) { + return; + } + FileTaskEntity task = loadTaskForExecution(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + return; + } + List rows = listTaskRows(taskId); + if (rows.isEmpty()) { + fileTaskMapper.deleteById(taskId); + taskCacheService.deleteTaskCache(taskId); + return; + } + updateTaskStatusFromRows(task, rows); + persistSnapshotJson(task, buildSnapshotFromDb(task, rows)); + fileTaskMapper.updateById(task); + } + + private long countTasks(Long userId, List statuses) { + Long count = fileTaskMapper.selectCount(new LambdaQueryWrapper() + .eq(FileTaskEntity::getModuleType, MODULE_TYPE) + .eq(FileTaskEntity::getUserId, userId) + .in(FileTaskEntity::getStatus, statuses)); + return count == null ? 0L : count; + } + + private List listTaskRows(Long taskId) { + return fileResultMapper.selectList(new LambdaQueryWrapper() + .eq(FileResultEntity::getTaskId, taskId) + .eq(FileResultEntity::getModuleType, MODULE_TYPE) + .orderByAsc(FileResultEntity::getId)); + } + + private Map normalizePayloadByShop(List shops) { + Map payloadByShop = new LinkedHashMap<>(); + for (QueryAsinShopPayloadDto item : shops) { + if (item == null) { + continue; + } + String shopKey = ziniaoShopSwitchService.normalizeShopName(item.getShopName()); + if (blank(shopKey)) { + continue; + } + item.setShopName(shopKey); + payloadByShop.put(shopKey, item); + } + return payloadByShop; + } + + private Map loadTaskMap(List entities) { + List taskIds = entities.stream() + .map(FileResultEntity::getTaskId) + .filter(id -> id != null && id > 0) + .distinct() + .toList(); + Map taskMap = new LinkedHashMap<>(); + if (taskIds.isEmpty()) { + return taskMap; + } + for (FileTaskEntity task : selectTasksByIdsInBatches(taskIds)) { + if (task != null && MODULE_TYPE.equals(task.getModuleType())) { + taskMap.put(task.getId(), task); + } + } + return taskMap; + } + + private Map> buildSnapshotMap(Map taskMap) { + Map> out = new LinkedHashMap<>(); + for (Map.Entry entry : taskMap.entrySet()) { + out.put(entry.getKey(), indexSnapshotByResultId(parseTaskSnapshots(entry.getValue().getResultJson()))); + } + return out; + } + + private QueryAsinResultItemVo toHistoryItem(FileResultEntity entity, FileTaskEntity task, QueryAsinResultItemVo snapshot) { + QueryAsinResultItemVo item = snapshot != null ? snapshot : new QueryAsinResultItemVo(); + item.setResultId(entity.getId()); + item.setTaskId(entity.getTaskId()); + item.setShopName(firstNonBlank(item.getShopName(), entity.getSourceFilename())); + item.setShopId(firstNonBlank(item.getShopId(), entity.getSourceFileUrl())); + item.setTaskStatus(task != null ? task.getStatus() : item.getTaskStatus()); + item.setSuccess(entity.getSuccess() == null ? item.getSuccess() : entity.getSuccess() == 1); + item.setError(!blank(entity.getErrorMessage()) ? entity.getErrorMessage() : item.getError()); + item.setCreatedAt(entity.getCreatedAt()); + item.setFinishedAt(task != null ? task.getFinishedAt() : item.getFinishedAt()); + item.setOutputFilename(firstNonBlank(item.getOutputFilename(), entity.getResultFilename())); + item.setDownloadUrl(blank(entity.getResultFileUrl()) + ? item.getDownloadUrl() + : ossStorageService.generateFreshDownloadUrl(entity.getResultFileUrl())); + if (item.getCountrySections() == null) { + item.setCountrySections(new ArrayList<>()); + } + if (item.getCartRatios() == null) { + item.setCartRatios(new ArrayList<>()); + } + if (item.getQueryAsins() == null) { + item.setQueryAsins(new ArrayList<>()); + } + return item; + } + + private List dedupeItems(List items) { + LinkedHashMap map = new LinkedHashMap<>(); + for (QueryAsinTaskItemDto item : items) { + if (item == null) { + continue; + } + String normalizedShopName = ziniaoShopSwitchService.normalizeShopName(item.getShopName()); + if (blank(normalizedShopName)) { + continue; + } + item.setShopName(normalizedShopName); + String key = normalizedShopName + "::" + Objects.toString(item.getShopId(), ""); + map.put(key, item); + } + return new ArrayList<>(map.values()); + } + + private QueryAsinResultItemVo toSnapshotVo(FileResultEntity result, QueryAsinTaskItemDto item, String taskStatus, LocalDateTime finishedAt) { + QueryAsinResultItemVo vo = new QueryAsinResultItemVo(); + vo.setResultId(result.getId()); + vo.setTaskId(result.getTaskId()); + vo.setShopName(item.getShopName()); + vo.setShopId(item.getShopId()); + vo.setPlatform(item.getPlatform()); + vo.setCompanyName(item.getCompanyName()); + vo.setMatched(item.isMatched()); + vo.setMatchStatus(item.getMatchStatus()); + vo.setMatchMessage(item.getMatchMessage()); + vo.setTaskStatus(taskStatus); + vo.setSuccess(result.getSuccess() == null ? null : result.getSuccess() == 1); + vo.setError(result.getErrorMessage()); + vo.setCreatedAt(result.getCreatedAt()); + vo.setFinishedAt(finishedAt); + vo.setCountrySections(new ArrayList<>()); + vo.setCartRatios(new ArrayList<>()); + vo.setQueryAsins(copyCountryAsins(item.getQueryAsins())); + vo.setOutputFilename(result.getResultFilename()); + vo.setDownloadUrl(null); + return vo; + } + + private void persistTaskJson(FileTaskEntity task, List requestItems, List snapshots) { + try { + task.setRequestJson(objectMapper.writeValueAsString(requestItems)); + task.setResultJson(objectMapper.writeValueAsString(snapshots)); + fileTaskMapper.updateById(task); + } catch (Exception ex) { + throw new BusinessException("查询ASIN任务快照保存失败"); + } + } + + private List buildSnapshotFromDb(FileTaskEntity task, List rows) { + List existing = parseTaskSnapshots(task.getResultJson()); + Map snapshotByResultId = indexSnapshotByResultId(existing); + List list = new ArrayList<>(); + for (FileResultEntity row : rows) { + list.add(toHistoryItem(row, task, snapshotByResultId.get(row.getId()))); + } + return list; + } + + private Map indexSnapshotByResultId(List snapshots) { + Map map = new LinkedHashMap<>(); + if (snapshots == null) { + return map; + } + for (QueryAsinResultItemVo snapshot : snapshots) { + if (snapshot != null && snapshot.getResultId() != null) { + map.put(snapshot.getResultId(), snapshot); + } + } + return map; + } + + private void updateTaskStatusFromRows(FileTaskEntity task, List rows) { + long successCount = rows.stream().filter(row -> Integer.valueOf(1).equals(row.getSuccess())).count(); + long failedCount = rows.stream().filter(row -> Integer.valueOf(0).equals(row.getSuccess())).count(); + long pendingCount = rows.stream().filter(row -> !isResultFinished(row)).count(); + task.setSuccessFileCount((int) successCount); + task.setFailedFileCount((int) failedCount); + task.setUpdatedAt(LocalDateTime.now()); + if (pendingCount > 0) { + task.setStatus("RUNNING"); + task.setFinishedAt(null); + task.setErrorMessage(null); + return; + } + task.setStatus(failedCount > 0 ? "FAILED" : "SUCCESS"); + task.setFinishedAt(LocalDateTime.now()); + if (failedCount > 0) { + List errors = new ArrayList<>(); + for (FileResultEntity row : rows) { + if (!blank(row.getErrorMessage())) { + errors.add(row.getSourceFilename() + ": " + row.getErrorMessage()); + } + } + task.setErrorMessage(String.join("; ", errors)); + } else { + task.setErrorMessage(null); + } + } + + private QueryAsinShopPayloadDto mergeShopPayload(Long taskId, String shopKey, QueryAsinShopPayloadDto incoming) { + QueryAsinShopPayloadDto merged = taskCacheService.getShopMergedPayload(taskId, shopKey); + if (merged == null) { + merged = new QueryAsinShopPayloadDto(); + merged.setShopName(shopKey); + merged.setCountrySections(new ArrayList<>()); + merged.setCartRatios(new ArrayList<>()); + merged.setQueryAsins(new ArrayList<>()); + } + + merged.setShopName(firstNonBlank(incoming.getShopName(), merged.getShopName())); + merged.setSubmissionId(firstNonBlank(incoming.getSubmissionId(), merged.getSubmissionId())); + merged.setChunkIndex(incoming.getChunkIndex()); + merged.setChunkTotal(incoming.getChunkTotal()); + + if (!blank(incoming.getError())) { + merged.setError(incoming.getError().trim()); + merged.setShopDone(Boolean.TRUE); + taskCacheService.saveShopMergedPayload(taskId, shopKey, merged); + return merged; + } + + merged.setCountrySections(mergeCountrySections(merged.getCountrySections(), incoming.getCountrySections())); + merged.setCartRatios(mergeCartRatios(merged.getCartRatios(), incoming.getCartRatios())); + merged.setQueryAsins(mergeCountryAsins(merged.getQueryAsins(), incoming.getQueryAsins())); + if (Boolean.TRUE.equals(incoming.getShopDone())) { + merged.setShopDone(Boolean.TRUE); + } + taskCacheService.saveShopMergedPayload(taskId, shopKey, merged); + return merged; + } + + private void mergePayloadIntoSnapshot(QueryAsinResultItemVo snapshot, QueryAsinShopPayloadDto payload) { + if (snapshot == null || payload == null) { + return; + } + snapshot.setShopName(firstNonBlank(payload.getShopName(), snapshot.getShopName())); + snapshot.setCountrySections(copyCountrySections(payload.getCountrySections())); + snapshot.setCartRatios(copyCartRatios(payload.getCartRatios())); + if (payload.getQueryAsins() != null && !payload.getQueryAsins().isEmpty()) { + snapshot.setQueryAsins(copyCountryAsins(payload.getQueryAsins())); + } + if (!blank(payload.getError())) { + snapshot.setError(payload.getError().trim()); + } + } + + private void applySuccessToSnapshot(QueryAsinResultItemVo snapshot) { + if (snapshot == null) { + return; + } + snapshot.setSuccess(Boolean.TRUE); + snapshot.setError(null); + } + + private void applyFailureToSnapshot(QueryAsinResultItemVo snapshot, String error) { + if (snapshot == null) { + return; + } + snapshot.setSuccess(Boolean.FALSE); + snapshot.setError(blankToNull(error)); + } + + private List mergeCountrySections(List base, List incoming) { + Map map = new LinkedHashMap<>(); + for (QueryAsinCountrySectionDto section : copyCountrySections(base)) { + map.put(section.getCountry(), section); + } + for (QueryAsinCountrySectionDto section : copyCountrySections(incoming)) { + QueryAsinCountrySectionDto existing = map.get(section.getCountry()); + if (existing == null) { + map.put(section.getCountry(), section); + continue; + } + List mergedRows = existing.getRows() == null + ? new ArrayList<>() + : new ArrayList<>(existing.getRows()); + if (section.getRows() != null) { + mergedRows.addAll(section.getRows()); + } + existing.setRows(mergedRows); + } + return new ArrayList<>(map.values()); + } + + private List mergeCartRatios(List base, List incoming) { + Map map = new LinkedHashMap<>(); + for (QueryAsinCartRatioDto ratio : copyCartRatios(base)) { + map.put(ratio.getCountry(), ratio); + } + for (QueryAsinCartRatioDto ratio : copyCartRatios(incoming)) { + if (!blank(ratio.getCountry())) { + map.put(ratio.getCountry(), ratio); + } + } + return new ArrayList<>(map.values()); + } + + private List mergeCountryAsins(List base, List incoming) { + Map map = new LinkedHashMap<>(); + for (QueryAsinCountryAsinsDto item : copyCountryAsins(base)) { + map.put(item.getCountry(), item); + } + for (QueryAsinCountryAsinsDto item : copyCountryAsins(incoming)) { + if (blank(item.getCountry())) { + continue; + } + QueryAsinCountryAsinsDto existing = map.get(item.getCountry()); + if (existing == null) { + map.put(item.getCountry(), item); + continue; + } + List merged = new ArrayList<>(existing.getAsins() == null ? List.of() : existing.getAsins()); + for (String asin : item.getAsins() == null ? List.of() : item.getAsins()) { + String normalized = asin == null ? "" : asin.trim().toUpperCase(); + if (!normalized.isEmpty() && !merged.contains(normalized)) { + merged.add(normalized); + } + } + existing.setAsins(merged); + } + return new ArrayList<>(map.values()); + } + + private boolean hasAnyPayloadData(QueryAsinShopPayloadDto payload) { + if (payload == null) { + return false; + } + if (payload.getQueryAsins() != null) { + for (QueryAsinCountryAsinsDto item : payload.getQueryAsins()) { + if (item != null && item.getAsins() != null && !item.getAsins().isEmpty()) { + return true; + } + } + } + if (payload.getCountrySections() != null) { + for (QueryAsinCountrySectionDto section : payload.getCountrySections()) { + if (section == null || section.getRows() == null) { + continue; + } + for (QueryAsinCountryMetricRowDto row : section.getRows()) { + if (row != null && (!blank(row.getStatus()) + || !blank(row.getQuantity()) + || !blank(row.getDeleteQuantity()) + || !blank(row.getProcessStatus()))) { + return true; + } + } + } + } + if (payload.getCartRatios() != null) { + for (QueryAsinCartRatioDto ratio : payload.getCartRatios()) { + if (ratio != null && (!blank(ratio.getCountry()) || !blank(ratio.getRatio()))) { + return true; + } + } + } + return false; + } + + private void finalizeTaskWorkbook(FileTaskEntity task, List rows, List snapshots) { + List successItems = snapshots.stream() + .filter(item -> Boolean.TRUE.equals(item.getSuccess())) + .toList(); + if (!successItems.isEmpty()) { + File workRoot = FileUtil.mkdir(FileUtil.file(System.getProperty("java.io.tmpdir"), "query-asin-result", String.valueOf(task.getId()))); + String filename = safeFileStem("查询ASIN-" + task.getId()) + ".xlsx"; + File xlsx = FileUtil.file(workRoot, filename); + try { + excelAssemblyService.writeWorkbook(xlsx, successItems); + String objectKey = ossStorageService.uploadResultFile(xlsx, MODULE_TYPE); + long fileSize = xlsx.length(); + int rowCount = excelAssemblyService.countRows(successItems); + for (FileResultEntity row : rows) { + if (Integer.valueOf(1).equals(row.getSuccess())) { + row.setResultFilename(filename); + row.setResultFileUrl(objectKey); + row.setResultFileSize(fileSize); + row.setResultContentType(CONTENT_TYPE_XLSX); + row.setRowCount(rowCount); + fileResultMapper.updateById(row); + } + } + snapshots = buildSnapshotFromDb(task, rows); + } finally { + FileUtil.del(xlsx); + } + } + + persistSnapshotJson(task, snapshots); + fileTaskMapper.updateById(task); + taskCacheService.deleteTaskCache(task.getId()); + } + + private void markResultSuccess(FileResultEntity row) { + row.setSuccess(1); + row.setErrorMessage(null); + fileResultMapper.updateById(row); + } + + private void markResultFailed(FileResultEntity row, String message) { + row.setSuccess(0); + row.setErrorMessage(blankToNull(message)); + row.setResultFilename(null); + row.setResultFileUrl(null); + row.setResultFileSize(0L); + row.setResultContentType(null); + row.setRowCount(0); + fileResultMapper.updateById(row); + } + + private boolean isResultFinished(FileResultEntity row) { + return Integer.valueOf(1).equals(row.getSuccess()) || Integer.valueOf(0).equals(row.getSuccess()); + } + + private List parseTaskSnapshots(String json) { + if (blank(json)) { + return new ArrayList<>(); + } + try { + return objectMapper.readValue(json, new TypeReference>() {}); + } catch (Exception ex) { + log.warn("[query-asin] parse task snapshot failed: {}", ex.getMessage()); + return new ArrayList<>(); + } + } + + private void persistSnapshotJson(FileTaskEntity task, List snapshots) { + try { + task.setResultJson(objectMapper.writeValueAsString(snapshots == null ? List.of() : snapshots)); + } catch (Exception ex) { + throw new BusinessException("查询ASIN任务快照保存失败"); + } + } + + private List copyCountrySections(List sections) { + List copy = new ArrayList<>(); + if (sections == null) { + return copy; + } + for (QueryAsinCountrySectionDto section : sections) { + if (section == null) { + continue; + } + QueryAsinCountrySectionDto item = new QueryAsinCountrySectionDto(); + item.setCountry(section.getCountry()); + item.setRows(section.getRows() == null ? new ArrayList<>() : new ArrayList<>(section.getRows())); + copy.add(item); + } + return copy; + } + + private List copyCartRatios(List ratios) { + List copy = new ArrayList<>(); + if (ratios == null) { + return copy; + } + for (QueryAsinCartRatioDto ratio : ratios) { + if (ratio == null) { + continue; + } + QueryAsinCartRatioDto item = new QueryAsinCartRatioDto(); + item.setCountry(ratio.getCountry()); + item.setRatio(ratio.getRatio()); + copy.add(item); + } + return copy; + } + + private List copyCountryAsins(List items) { + List copy = new ArrayList<>(); + if (items == null) { + return copy; + } + for (QueryAsinCountryAsinsDto source : items) { + if (source == null || blank(source.getCountry())) { + continue; + } + QueryAsinCountryAsinsDto item = new QueryAsinCountryAsinsDto(); + item.setCountry(source.getCountry().trim().toUpperCase()); + List asins = new ArrayList<>(); + if (source.getAsins() != null) { + for (String asin : source.getAsins()) { + String normalized = asin == null ? "" : asin.trim().toUpperCase(); + if (!normalized.isEmpty() && !asins.contains(normalized)) { + asins.add(normalized); + } + } + } + item.setAsins(asins); + copy.add(item); + } + return copy; + } + + private String firstNonBlank(String first, String second) { + return !blank(first) ? first : second; + } + + private String safeFileStem(String value) { + String raw = value == null ? "result" : value.trim(); + String safe = raw.replaceAll("[\\\\/:*?\"<>|]+", "_"); + return safe.isBlank() ? "result" : safe; + } + + private boolean blank(String value) { + return value == null || value.isBlank(); + } + + private String blankToNull(String value) { + return blank(value) ? null : value.trim(); + } + + private void validateUserId(Long userId) { + if (userId == null || userId <= 0) { + throw new BusinessException("user_id 不合法"); + } + } +} + + diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java new file mode 100644 index 0000000..860bc7a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java @@ -0,0 +1,125 @@ +package com.nanri.aiimage.modules.shopkey.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCountryUpdateRequest; +import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCreateRequest; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportProgressVo; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportStartVo; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinItemVo; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinPageVo; +import com.nanri.aiimage.modules.shopkey.service.QueryAsinService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/admin/query-asins") +@Tag(name = "查询 ASIN", description = "维护店铺按国家查询的 ASIN") +public class QueryAsinController { + + private final QueryAsinService queryAsinService; + + @GetMapping + @Operation(summary = "分页查询 ASIN") + public ApiResponse page( + @Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page, + @Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize, + @Parameter(description = "分组ID") @RequestParam(required = false) Long groupId, + @Parameter(description = "店铺名") @RequestParam(required = false) String shopName, + @Parameter(description = "ASIN") @RequestParam(required = false) String asin, + @Parameter(description = "当前操作人用户ID") @RequestParam(required = false) Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + return ApiResponse.success(queryAsinService.page( + page, + pageSize, + groupId, + shopName, + asin, + operatorId, + Boolean.TRUE.equals(superAdmin))); + } + + @PostMapping + @Operation(summary = "新增或覆盖查询 ASIN") + public ApiResponse create( + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, + @Valid @RequestBody QueryAsinCreateRequest request) { + return ApiResponse.success("保存成功", + queryAsinService.createOrUpdate(request, operatorId, Boolean.TRUE.equals(superAdmin))); + } + + @PostMapping("/import") + @Operation(summary = "导入添加查询 ASIN") + public ApiResponse importExcel( + @Parameter(description = "xlsx/xls 文件", required = true) @RequestParam("file") MultipartFile file, + @Parameter(description = "Excel 未提供分组时使用的分组ID") @RequestParam(required = false) Long groupId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + return ApiResponse.success("开始导入", + queryAsinService.startImport(file, groupId, operatorId, Boolean.TRUE.equals(superAdmin))); + } + + @GetMapping("/import/{importId}") + @Operation(summary = "查询导入添加进度") + public ApiResponse importProgress(@PathVariable String importId) { + return ApiResponse.success(queryAsinService.getImportProgress(importId)); + } + + @PostMapping("/delete-import") + @Operation(summary = "导入删除查询 ASIN") + public ApiResponse deleteImportExcel( + @Parameter(description = "xlsx/xls 文件", required = true) @RequestParam("file") MultipartFile file, + @Parameter(description = "Excel 未提供分组时使用的分组ID") @RequestParam(required = false) Long groupId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + return ApiResponse.success("开始删除", + queryAsinService.startDeleteImport(file, groupId, operatorId, Boolean.TRUE.equals(superAdmin))); + } + + @GetMapping("/delete-import/{importId}") + @Operation(summary = "查询导入删除进度") + public ApiResponse deleteImportProgress(@PathVariable String importId) { + return ApiResponse.success(queryAsinService.getDeleteImportProgress(importId)); + } + + @PutMapping("/{id}/countries/{country}") + @Operation(summary = "编辑指定国家的查询 ASIN") + public ApiResponse updateCountry( + @Parameter(description = "主键ID", required = true) @PathVariable Long id, + @Parameter(description = "国家编码", required = true) @PathVariable String country, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, + @Valid @RequestBody QueryAsinCountryUpdateRequest request) { + return ApiResponse.success("保存成功", queryAsinService.updateCountry( + id, + country, + request.getAsin(), + operatorId, + Boolean.TRUE.equals(superAdmin))); + } + + @DeleteMapping("/{id}/countries/{country}") + @Operation(summary = "删除指定国家的查询 ASIN") + public ApiResponse deleteCountry( + @Parameter(description = "主键ID", required = true) @PathVariable Long id, + @Parameter(description = "国家编码", required = true) @PathVariable String country, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + queryAsinService.deleteCountry(id, country, operatorId, Boolean.TRUE.equals(superAdmin)); + return ApiResponse.success("删除成功", null); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/QueryAsinMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/QueryAsinMapper.java new file mode 100644 index 0000000..4011b93 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/QueryAsinMapper.java @@ -0,0 +1,55 @@ +package com.nanri.aiimage.modules.shopkey.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.shopkey.model.entity.QueryAsinEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Insert; + +import java.util.Collection; +import java.util.List; + +@Mapper +public interface QueryAsinMapper extends BaseMapper { + + @Select(""" + + """) + List selectByGroupIdsAndShopNames(@Param("groupIds") Collection groupIds, + @Param("shopNames") Collection shopNames); + + @Select(""" + + """) + List selectByShopNames(@Param("shopNames") Collection shopNames); + + @Insert(""" + + """) + int insertBatch(@Param("rows") List rows); +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCountryUpdateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCountryUpdateRequest.java new file mode 100644 index 0000000..59e9704 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCountryUpdateRequest.java @@ -0,0 +1,13 @@ +package com.nanri.aiimage.modules.shopkey.model.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Data +public class QueryAsinCountryUpdateRequest { + + @Schema(description = "ASIN", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "ASIN 不能为空") + private String asin; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCreateRequest.java new file mode 100644 index 0000000..995dc68 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/QueryAsinCreateRequest.java @@ -0,0 +1,32 @@ +package com.nanri.aiimage.modules.shopkey.model.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class QueryAsinCreateRequest { + + @NotNull(message = "分组不能为空") + private Long groupId; + + @NotBlank(message = "店铺名不能为空") + private String shopName; + + @NotEmpty(message = "请至少选择一个国家") + private List countries; + + /** + * 兼容旧请求：选中的国家共用同一个 ASIN。 + */ + private String asin; + + /** + * 新请求：每个国家对应独立 ASIN，例如 {"DE":"B0...", "UK":"B0..."}。 + */ + private Map asinMappings; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/QueryAsinEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/QueryAsinEntity.java new file mode 100644 index 0000000..795ec64 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/QueryAsinEntity.java @@ -0,0 +1,44 @@ +package com.nanri.aiimage.modules.shopkey.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("biz_query_asin") +public class QueryAsinEntity { + + @TableId(type = IdType.AUTO) + private Long id; + + @TableField("group_id") + private Long groupId; + + @TableField("shop_name") + private String shopName; + + @TableField("asin_de") + private String asinDe; + + @TableField("asin_uk") + private String asinUk; + + @TableField("asin_fr") + private String asinFr; + + @TableField("asin_it") + private String asinIt; + + @TableField("asin_es") + private String asinEs; + + @TableField("created_at") + private LocalDateTime createdAt; + + @TableField("updated_at") + private LocalDateTime updatedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportProgressVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportProgressVo.java new file mode 100644 index 0000000..4989861 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportProgressVo.java @@ -0,0 +1,16 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +@Data +public class QueryAsinImportProgressVo { + + private String status; + private Integer totalRows; + private Integer processedRows; + private Integer asinCount; + private Integer insertedCount; + private Integer deletedCount; + private Integer skippedCount; + private String errorMessage; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportStartVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportStartVo.java new file mode 100644 index 0000000..f6644f2 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinImportStartVo.java @@ -0,0 +1,9 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +@Data +public class QueryAsinImportStartVo { + + private String importId; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinItemVo.java new file mode 100644 index 0000000..1b94a59 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinItemVo.java @@ -0,0 +1,21 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class QueryAsinItemVo { + + private Long id; + private Long groupId; + private String groupName; + private String shopName; + private String asinDe; + private String asinUk; + private String asinFr; + private String asinIt; + private String asinEs; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinPageVo.java new file mode 100644 index 0000000..b81f9c3 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/QueryAsinPageVo.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class QueryAsinPageVo { + + private List items = new ArrayList<>(); + private Long total = 0L; + private Long page = 1L; + private Long pageSize = 15L; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java new file mode 100644 index 0000000..e8a39d7 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/QueryAsinService.java @@ -0,0 +1,828 @@ +package com.nanri.aiimage.modules.shopkey.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import cn.hutool.core.util.IdUtil; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.common.util.ExcelStreamReader; +import com.nanri.aiimage.config.TaskPressureProperties; +import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper; +import com.nanri.aiimage.modules.shopkey.model.dto.QueryAsinCreateRequest; +import com.nanri.aiimage.modules.shopkey.model.entity.QueryAsinEntity; +import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportProgressVo; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinImportStartVo; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinItemVo; +import com.nanri.aiimage.modules.shopkey.model.vo.QueryAsinPageVo; +import com.nanri.aiimage.modules.shopkey.model.vo.ShopManageGroupItemVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +@Service +@RequiredArgsConstructor +public class QueryAsinService { + + private static final List SUPPORTED_COUNTRIES = List.of("DE", "UK", "FR", "IT", "ES"); + private static final String KEY_SEPARATOR = Character.toString((char) 1); + private static final String UTF8_BOM = Character.toString(0xFEFF); + + private final QueryAsinMapper queryAsinMapper; + private final ShopManageGroupService shopManageGroupService; + private final TaskPressureProperties taskPressureProperties; + private final Map importProgressMap = new ConcurrentHashMap<>(); + private final Map deleteImportProgressMap = new ConcurrentHashMap<>(); + + public QueryAsinPageVo page(long page, long pageSize, Long groupId, String shopName, String asin, + Long operatorId, boolean superAdmin) { + long safePage = Math.max(page, 1); + long safePageSize = Math.min(Math.max(pageSize, 1), 100); + String safeShopName = normalizeBlank(shopName); + String safeAsin = normalizeBlank(asin); + Set accessibleGroupIds = superAdmin ? Set.of() : shopManageGroupService.listAccessibleGroupIds(operatorId, false); + + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(groupId != null && groupId > 0, QueryAsinEntity::getGroupId, groupId) + .like(!safeShopName.isEmpty(), QueryAsinEntity::getShopName, safeShopName) + .and(!safeAsin.isEmpty(), wrapper -> wrapper + .like(QueryAsinEntity::getAsinDe, safeAsin) + .or().like(QueryAsinEntity::getAsinUk, safeAsin) + .or().like(QueryAsinEntity::getAsinFr, safeAsin) + .or().like(QueryAsinEntity::getAsinIt, safeAsin) + .or().like(QueryAsinEntity::getAsinEs, safeAsin)) + .orderByDesc(QueryAsinEntity::getId); + + if (!superAdmin) { + if (accessibleGroupIds.isEmpty()) { + query.eq(QueryAsinEntity::getId, -1L); + } else { + query.in(QueryAsinEntity::getGroupId, accessibleGroupIds); + } + } + + Long total = queryAsinMapper.selectCount(query); + List rows = queryAsinMapper + .selectList(query.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize)); + + Map groupNameById = buildGroupNameMap(rows.stream() + .map(QueryAsinEntity::getGroupId) + .filter(id -> id != null && id > 0) + .distinct() + .toList()); + + QueryAsinPageVo vo = new QueryAsinPageVo(); + vo.setItems(rows.stream().map(row -> toItemVo(row, groupNameById.get(row.getGroupId()))).toList()); + vo.setTotal(total); + vo.setPage(safePage); + vo.setPageSize(safePageSize); + return vo; + } + + @Transactional + public QueryAsinItemVo createOrUpdate(QueryAsinCreateRequest request, Long operatorId, boolean superAdmin) { + ShopManageGroupEntity group = shopManageGroupService.getAccessibleById(request.getGroupId(), operatorId, superAdmin); + String shopName = normalizeRequired(request.getShopName(), "店铺名不能为空"); + Set countries = normalizeCountries(request.getCountries()); + Map countryAsinMap = normalizeCountryAsinMap(countries, request); + + QueryAsinEntity entity = newImportEntity(group.getId(), shopName); + + for (Map.Entry entry : countryAsinMap.entrySet()) { + setCountryAsin(entity, entry.getKey(), entry.getValue()); + } + + List existingRows = queryAsinMapper.selectByGroupIdsAndShopNames( + List.of(group.getId()), List.of(shopName)); + for (QueryAsinEntity existing : existingRows) { + if (rowSignature(existing).equals(rowSignature(entity))) { + return toItemVo(existing, group.getGroupName()); + } + } + queryAsinMapper.insert(entity); + return toItemVo(getById(entity.getId()), group.getGroupName()); + } + + @Transactional + public void deleteCountry(Long id, String country, Long operatorId, boolean superAdmin) { + QueryAsinEntity entity = getById(id); + validateGroupAccess(entity, operatorId, superAdmin); + setCountryAsin(entity, normalizeCountry(country), ""); + if (isEmptyRow(entity)) { + queryAsinMapper.deleteById(entity.getId()); + return; + } + queryAsinMapper.updateById(entity); + } + + @Transactional + public QueryAsinItemVo updateCountry(Long id, String country, String asin, Long operatorId, boolean superAdmin) { + QueryAsinEntity entity = getById(id); + validateGroupAccess(entity, operatorId, superAdmin); + setCountryAsin(entity, normalizeCountry(country), normalizeAsin(asin)); + queryAsinMapper.updateById(entity); + QueryAsinEntity saved = getById(entity.getId()); + String groupName = ""; + try { + ShopManageGroupEntity group = shopManageGroupService.getById(saved.getGroupId()); + groupName = group.getGroupName(); + } catch (Exception ignored) { + groupName = ""; + } + return toItemVo(saved, groupName); + } + + public QueryAsinImportStartVo startImport(MultipartFile file, Long fallbackGroupId, + Long operatorId, boolean superAdmin) { + return startImportTask(file, fallbackGroupId, operatorId, superAdmin, false); + } + + public QueryAsinImportProgressVo getImportProgress(String importId) { + QueryAsinImportProgressVo progress = importProgressMap.get(importId); + if (progress == null) { + throw new BusinessException("导入任务不存在"); + } + return progress; + } + + public QueryAsinImportStartVo startDeleteImport(MultipartFile file, Long fallbackGroupId, + Long operatorId, boolean superAdmin) { + return startImportTask(file, fallbackGroupId, operatorId, superAdmin, true); + } + + public QueryAsinImportProgressVo getDeleteImportProgress(String importId) { + QueryAsinImportProgressVo progress = deleteImportProgressMap.get(importId); + if (progress == null) { + throw new BusinessException("删除任务不存在"); + } + return progress; + } + + private QueryAsinImportStartVo startImportTask(MultipartFile file, Long fallbackGroupId, Long operatorId, + boolean superAdmin, boolean deleteMode) { + if (file == null || file.isEmpty()) { + throw new BusinessException("请上传 xlsx 或 xls 文件"); + } + String filename = file.getOriginalFilename(); + validateExcelFilename(filename); + if (fallbackGroupId != null && fallbackGroupId > 0) { + shopManageGroupService.getAccessibleById(fallbackGroupId, operatorId, superAdmin); + } + + String importId = IdUtil.fastSimpleUUID(); + QueryAsinImportProgressVo progress = newImportProgress(); + Map progressMap = deleteMode ? deleteImportProgressMap : importProgressMap; + progressMap.put(importId, progress); + try { + File tempFile = saveMultipartToTempFile(file, deleteMode ? "query-asin-delete-" : "query-asin-import-"); + Thread.ofVirtual().start(() -> runImportTask(importId, tempFile, filename, fallbackGroupId, + operatorId, superAdmin, deleteMode)); + } catch (Exception ex) { + progressMap.remove(importId); + throw new BusinessException("读取上传文件失败"); + } + + QueryAsinImportStartVo vo = new QueryAsinImportStartVo(); + vo.setImportId(importId); + return vo; + } + + private QueryAsinImportProgressVo newImportProgress() { + QueryAsinImportProgressVo progress = new QueryAsinImportProgressVo(); + progress.setStatus("pending"); + progress.setTotalRows(0); + progress.setProcessedRows(0); + progress.setAsinCount(0); + progress.setInsertedCount(0); + progress.setDeletedCount(0); + progress.setSkippedCount(0); + return progress; + } + + private void runImportTask(String importId, File tempFile, String filename, Long fallbackGroupId, + Long operatorId, boolean superAdmin, boolean deleteMode) { + Map progressMap = deleteMode ? deleteImportProgressMap : importProgressMap; + QueryAsinImportProgressVo progress = progressMap.get(importId); + if (progress == null) { + deleteQuietly(tempFile); + return; + } + progress.setStatus("running"); + progress.setErrorMessage(null); + try { + processImportFile(tempFile, filename, fallbackGroupId, operatorId, superAdmin, deleteMode, progress); + progress.setStatus("success"); + } catch (Exception ex) { + progress.setStatus("failed"); + progress.setErrorMessage(ex instanceof BusinessException ? ex.getMessage() + : (deleteMode ? "导入删除 Excel 失败" : "导入添加 Excel 失败")); + } finally { + deleteQuietly(tempFile); + } + } + + private void processImportFile(File tempFile, String filename, Long fallbackGroupId, Long operatorId, + boolean superAdmin, boolean deleteMode, QueryAsinImportProgressVo progress) throws Exception { + validateExcelFilename(filename); + ImportContext context = new ImportContext(fallbackGroupId, operatorId, superAdmin, deleteMode, progress); + ExcelStreamReader.readFirstSheet(tempFile, new ExcelStreamReader.SheetRowHandler() { + @Override + public void onHeader(String sheetName, Integer sheetNo, Map headerMap) { + context.setHeaderMap(headerMap); + } + + @Override + public void onRow(String sheetName, Integer sheetNo, int rowIndex, + Map headerMap, Map rowMap) { + context.consumeRow(rowIndex, headerMap, rowMap); + } + }); + context.flush(); + if (!context.hasHeader()) { + throw new BusinessException("Excel 表头为空"); + } + } + + private File saveMultipartToTempFile(MultipartFile file, String prefix) throws Exception { + String suffix = ".xlsx"; + String name = file.getOriginalFilename(); + if (name != null) { + int idx = name.lastIndexOf('.'); + if (idx >= 0) { + suffix = name.substring(idx); + } + } + File tempFile = File.createTempFile(prefix, suffix); + file.transferTo(tempFile); + return tempFile; + } + + private void deleteQuietly(File file) { + if (file == null) { + return; + } + try { + Files.deleteIfExists(file.toPath()); + } catch (Exception ignored) { + } + } + + private void validateExcelFilename(String filename) { + String lowerFilename = filename == null ? "" : filename.toLowerCase(Locale.ROOT); + if (!(lowerFilename.endsWith(".xlsx") || lowerFilename.endsWith(".xls"))) { + throw new BusinessException("仅支持 .xlsx 或 .xls 文件"); + } + } + + private QueryAsinEntity getById(Long id) { + QueryAsinEntity entity = queryAsinMapper.selectById(id); + if (entity == null) { + throw new BusinessException("记录不存在"); + } + return entity; + } + + private void validateGroupAccess(QueryAsinEntity entity, Long operatorId, boolean superAdmin) { + shopManageGroupService.getAccessibleById(entity.getGroupId(), operatorId, superAdmin); + } + + private QueryAsinItemVo toItemVo(QueryAsinEntity entity, String groupName) { + QueryAsinItemVo vo = new QueryAsinItemVo(); + vo.setId(entity.getId()); + vo.setGroupId(entity.getGroupId()); + vo.setGroupName(groupName == null ? "" : groupName); + vo.setShopName(entity.getShopName()); + vo.setAsinDe(blankToEmpty(entity.getAsinDe())); + vo.setAsinUk(blankToEmpty(entity.getAsinUk())); + vo.setAsinFr(blankToEmpty(entity.getAsinFr())); + vo.setAsinIt(blankToEmpty(entity.getAsinIt())); + vo.setAsinEs(blankToEmpty(entity.getAsinEs())); + vo.setCreatedAt(entity.getCreatedAt()); + vo.setUpdatedAt(entity.getUpdatedAt()); + return vo; + } + + private Map buildGroupNameMap(List groupIds) { + if (groupIds == null || groupIds.isEmpty()) { + return Map.of(); + } + LinkedHashMap map = new LinkedHashMap<>(); + for (Long groupId : groupIds) { + try { + ShopManageGroupEntity group = shopManageGroupService.getById(groupId); + map.put(groupId, group.getGroupName()); + } catch (Exception ignored) { + map.put(groupId, ""); + } + } + return map; + } + + private Set normalizeCountries(List countries) { + LinkedHashSet normalized = new LinkedHashSet<>(); + if (countries != null) { + for (String country : countries) { + normalized.add(normalizeCountry(country)); + } + } + if (normalized.isEmpty()) { + throw new BusinessException("请至少选择一个国家"); + } + return normalized; + } + + private Map normalizeCountryAsinMap(Set countries, QueryAsinCreateRequest request) { + LinkedHashMap normalized = new LinkedHashMap<>(); + Map requestMappings = request.getAsinMappings(); + if (requestMappings != null && !requestMappings.isEmpty()) { + for (String country : countries) { + String asin = requestMappings.get(country); + if (asin == null) { + asin = requestMappings.get(country.toLowerCase(Locale.ROOT)); + } + normalized.put(country, normalizeAsin(asin)); + } + return normalized; + } + + String asin = normalizeAsin(request.getAsin()); + for (String country : countries) { + normalized.put(country, asin); + } + return normalized; + } + + private String normalizeCountry(String country) { + String normalized = normalizeBlank(country).toUpperCase(Locale.ROOT); + if (!SUPPORTED_COUNTRIES.contains(normalized)) { + throw new BusinessException("国家参数不支持: " + country); + } + return normalized; + } + + private String normalizeAsin(String asin) { + String normalized = normalizeRequired(asin, "ASIN 不能为空").toUpperCase(Locale.ROOT); + if (normalized.length() > 64) { + throw new BusinessException("ASIN 长度不能超过 64"); + } + return normalized; + } + + private String normalizeRequired(String value, String message) { + String normalized = normalizeBlank(value); + if (normalized.isEmpty()) { + throw new BusinessException(message); + } + return normalized; + } + + private String normalizeBlank(String value) { + return value == null ? "" : value.trim(); + } + + private String blankToEmpty(String value) { + return value == null ? "" : value; + } + + private void setCountryAsin(QueryAsinEntity entity, String country, String asin) { + String value = normalizeBlank(asin); + switch (country) { + case "DE" -> entity.setAsinDe(value); + case "UK" -> entity.setAsinUk(value); + case "FR" -> entity.setAsinFr(value); + case "IT" -> entity.setAsinIt(value); + case "ES" -> entity.setAsinEs(value); + default -> throw new BusinessException("国家参数不支持: " + country); + } + } + + private boolean isEmptyRow(QueryAsinEntity entity) { + return normalizeBlank(entity.getAsinDe()).isEmpty() + && normalizeBlank(entity.getAsinUk()).isEmpty() + && normalizeBlank(entity.getAsinFr()).isEmpty() + && normalizeBlank(entity.getAsinIt()).isEmpty() + && normalizeBlank(entity.getAsinEs()).isEmpty(); + } + + private String getCountryAsin(QueryAsinEntity entity, String country) { + return switch (country) { + case "DE" -> normalizeBlank(entity.getAsinDe()); + case "UK" -> normalizeBlank(entity.getAsinUk()); + case "FR" -> normalizeBlank(entity.getAsinFr()); + case "IT" -> normalizeBlank(entity.getAsinIt()); + case "ES" -> normalizeBlank(entity.getAsinEs()); + default -> ""; + }; + } + + private QueryAsinEntity newImportEntity(Long groupId, String shopName) { + QueryAsinEntity entity = new QueryAsinEntity(); + entity.setGroupId(groupId); + entity.setShopName(shopName); + entity.setAsinDe(""); + entity.setAsinUk(""); + entity.setAsinFr(""); + entity.setAsinIt(""); + entity.setAsinEs(""); + return entity; + } + + private String importKey(Long groupId, String shopName) { + return groupId + KEY_SEPARATOR + shopName; + } + + private String rowSignature(QueryAsinEntity entity) { + return importKey(entity.getGroupId(), normalizeBlank(entity.getShopName())) + + KEY_SEPARATOR + normalizeBlank(entity.getAsinDe()).toUpperCase(Locale.ROOT) + + KEY_SEPARATOR + normalizeBlank(entity.getAsinUk()).toUpperCase(Locale.ROOT) + + KEY_SEPARATOR + normalizeBlank(entity.getAsinFr()).toUpperCase(Locale.ROOT) + + KEY_SEPARATOR + normalizeBlank(entity.getAsinIt()).toUpperCase(Locale.ROOT) + + KEY_SEPARATOR + normalizeBlank(entity.getAsinEs()).toUpperCase(Locale.ROOT); + } + + private String normalizeExcelText(String value) { + return value == null ? "" : value.replace(UTF8_BOM, "").trim(); + } + + private String normalizeHeaderKey(String value) { + return normalizeExcelText(value).toLowerCase(Locale.ROOT) + .replace(" ", "") + .replace("_", "") + .replace("-", ""); + } + + private final class ImportContext { + private final Long fallbackGroupId; + private final Long operatorId; + private final boolean superAdmin; + private final boolean deleteMode; + private final QueryAsinImportProgressVo progress; + private final int batchSize = Math.max(1, taskPressureProperties.getDbSelectBatchSize()); + private final List pendingRows = new ArrayList<>(); + private final LinkedHashSet acceptedRowSignatures = new LinkedHashSet<>(); + private final Map groupIdByNameOrId = new HashMap<>(); + private final Map headerIndexByKey = new HashMap<>(); + private boolean groupsLoaded; + private boolean headerLoaded; + private int pendingCellCount; + private int asinCount; + private int insertedCount; + private int deletedCount; + private int skippedCount; + + private ImportContext(Long fallbackGroupId, Long operatorId, boolean superAdmin, + boolean deleteMode, QueryAsinImportProgressVo progress) { + this.fallbackGroupId = fallbackGroupId; + this.operatorId = operatorId; + this.superAdmin = superAdmin; + this.deleteMode = deleteMode; + this.progress = progress; + } + + private boolean hasHeader() { + return headerLoaded; + } + + private void setHeaderMap(Map headerMap) { + headerIndexByKey.clear(); + if (headerMap != null) { + for (Map.Entry entry : headerMap.entrySet()) { + String key = normalizeHeaderKey(entry.getValue()); + if (!key.isEmpty()) { + headerIndexByKey.putIfAbsent(key, entry.getKey()); + } + } + } + headerLoaded = true; + if (findGroupIndex() == null && (fallbackGroupId == null || fallbackGroupId <= 0)) { + throw new BusinessException("Excel 缺少分组列，请在页面选择分组或提供分组列"); + } + if (findShopIndex() == null) { + throw new BusinessException("Excel 缺少店铺名列"); + } + if (SUPPORTED_COUNTRIES.stream().noneMatch(country -> findCountryIndex(country) != null)) { + throw new BusinessException("Excel 至少需要包含一个国家 ASIN 列"); + } + } + + private void consumeRow(int rowIndex, Map headerMap, Map rowMap) { + if (!headerLoaded) { + setHeaderMap(headerMap); + } + progress.setTotalRows(Math.max(progress.getTotalRows() == null ? 0 : progress.getTotalRows(), rowIndex)); + progress.setProcessedRows(rowIndex); + + Long groupId = resolveGroupId(rowMap); + String shopName = cell(rowMap, findShopIndex()); + if (groupId == null || shopName.isEmpty()) { + skippedCount++; + updateProgress(); + return; + } + + QueryAsinEntity row = newImportEntity(groupId, shopName); + int rowAsinCount = 0; + int rowAcceptedCount = 0; + for (String country : SUPPORTED_COUNTRIES) { + Integer index = findCountryIndex(country); + if (index == null) { + continue; + } + String asin = normalizeBlank(cell(rowMap, index)).toUpperCase(Locale.ROOT); + if (asin.isEmpty()) { + continue; + } + if (asin.length() > 64) { + skippedCount++; + continue; + } + asinCount++; + rowAsinCount++; + setCountryAsin(row, country, asin); + rowAcceptedCount++; + } + if (rowAsinCount == 0) { + skippedCount++; + } + if (rowAcceptedCount > 0) { + String signature = rowSignature(row); + if (acceptedRowSignatures.add(signature)) { + pendingRows.add(row); + pendingCellCount += rowAcceptedCount; + } else { + skippedCount += rowAcceptedCount; + } + } + if (pendingRows.size() >= batchSize) { + flush(); + } + updateProgress(); + } + + private void flush() { + if (pendingRows.isEmpty()) { + return; + } + if (deleteMode) { + flushDelete(); + } else { + flushInsert(); + } + pendingRows.clear(); + pendingCellCount = 0; + updateProgress(); + } + + private void flushInsert() { + List targets = new ArrayList<>(pendingRows); + LinkedHashSet groupIds = new LinkedHashSet<>(); + LinkedHashSet shopNames = new LinkedHashSet<>(); + for (QueryAsinEntity target : targets) { + groupIds.add(target.getGroupId()); + shopNames.add(target.getShopName()); + } + Map> existingByKey = new LinkedHashMap<>(); + LinkedHashSet existingSignatures = new LinkedHashSet<>(); + if (!groupIds.isEmpty() && !shopNames.isEmpty()) { + for (QueryAsinEntity existing : queryAsinMapper.selectByGroupIdsAndShopNames(groupIds, shopNames)) { + existingByKey.computeIfAbsent(importKey(existing.getGroupId(), existing.getShopName()), + ignored -> new ArrayList<>()).add(existing); + existingSignatures.add(rowSignature(existing)); + } + } + List insertRows = new ArrayList<>(); + for (QueryAsinEntity target : targets) { + int cellCount = countCountryCells(target); + String signature = rowSignature(target); + if (existingSignatures.contains(signature)) { + skippedCount += cellCount; + continue; + } + QueryAsinEntity compatible = findCompatibleInsertCandidate( + target, + existingByKey.get(importKey(target.getGroupId(), target.getShopName()))); + if (compatible != null) { + int addedCells = mergeMissingCountryAsins(compatible, target); + if (addedCells > 0) { + queryAsinMapper.updateById(compatible); + insertedCount += addedCells; + } + skippedCount += cellCount - addedCells; + existingSignatures.add(rowSignature(compatible)); + continue; + } + insertRows.add(target); + insertedCount += cellCount; + existingSignatures.add(signature); + existingByKey.computeIfAbsent(importKey(target.getGroupId(), target.getShopName()), + ignored -> new ArrayList<>()).add(target); + } + if (!insertRows.isEmpty()) { + queryAsinMapper.insertBatch(insertRows); + } + } + + private QueryAsinEntity findCompatibleInsertCandidate(QueryAsinEntity target, List candidates) { + if (candidates == null || candidates.isEmpty()) { + return null; + } + QueryAsinEntity best = null; + int bestOverlap = -1; + for (QueryAsinEntity candidate : candidates) { + int overlap = 0; + boolean conflict = false; + for (String country : SUPPORTED_COUNTRIES) { + String targetAsin = getCountryAsin(target, country); + String candidateAsin = getCountryAsin(candidate, country); + if (targetAsin.isEmpty() || candidateAsin.isEmpty()) { + continue; + } + if (!targetAsin.equals(candidateAsin)) { + conflict = true; + break; + } + overlap++; + } + if (!conflict && overlap > bestOverlap) { + best = candidate; + bestOverlap = overlap; + } + } + return bestOverlap > 0 ? best : null; + } + + private int mergeMissingCountryAsins(QueryAsinEntity existing, QueryAsinEntity target) { + int addedCells = 0; + for (String country : SUPPORTED_COUNTRIES) { + String targetAsin = getCountryAsin(target, country); + if (targetAsin.isEmpty() || !getCountryAsin(existing, country).isEmpty()) { + continue; + } + setCountryAsin(existing, country, targetAsin); + addedCells++; + } + return addedCells; + } + + private void flushDelete() { + List targets = new ArrayList<>(pendingRows); + LinkedHashSet groupIds = new LinkedHashSet<>(); + LinkedHashSet shopNames = new LinkedHashSet<>(); + for (QueryAsinEntity target : targets) { + groupIds.add(target.getGroupId()); + shopNames.add(target.getShopName()); + } + Map> existingByKey = new LinkedHashMap<>(); + if (!groupIds.isEmpty() && !shopNames.isEmpty()) { + for (QueryAsinEntity existing : queryAsinMapper.selectByGroupIdsAndShopNames(groupIds, shopNames)) { + existingByKey.computeIfAbsent(importKey(existing.getGroupId(), existing.getShopName()), + ignored -> new ArrayList<>()).add(existing); + } + } + for (QueryAsinEntity target : targets) { + List candidates = existingByKey.get(importKey(target.getGroupId(), target.getShopName())); + if (candidates == null || candidates.isEmpty()) { + skippedCount += countCountryCells(target); + continue; + } + QueryAsinEntity existing = findBestDeleteCandidate(target, candidates); + if (existing == null) { + skippedCount += countCountryCells(target); + continue; + } + boolean changed = false; + for (String country : SUPPORTED_COUNTRIES) { + String asin = getCountryAsin(target, country); + if (asin.isEmpty()) { + continue; + } + if (asin.equals(getCountryAsin(existing, country))) { + setCountryAsin(existing, country, ""); + deletedCount++; + changed = true; + } else { + skippedCount++; + } + } + if (!changed) { + continue; + } + if (isEmptyRow(existing)) { + queryAsinMapper.deleteById(existing.getId()); + } else { + queryAsinMapper.updateById(existing); + } + } + } + + private QueryAsinEntity findBestDeleteCandidate(QueryAsinEntity target, List candidates) { + for (QueryAsinEntity candidate : candidates) { + boolean allMatch = true; + for (String country : SUPPORTED_COUNTRIES) { + String asin = getCountryAsin(target, country); + if (!asin.isEmpty() && !asin.equals(getCountryAsin(candidate, country))) { + allMatch = false; + break; + } + } + if (allMatch) { + return candidate; + } + } + return null; + } + + private int countCountryCells(QueryAsinEntity entity) { + int count = 0; + for (String country : SUPPORTED_COUNTRIES) { + if (!getCountryAsin(entity, country).isEmpty()) { + count++; + } + } + return count; + } + + private Long resolveGroupId(Map rowMap) { + Integer groupIndex = findGroupIndex(); + String groupText = cell(rowMap, groupIndex); + if (groupText.isEmpty()) { + return fallbackGroupId != null && fallbackGroupId > 0 ? fallbackGroupId : null; + } + loadGroups(); + Long id = groupIdByNameOrId.get(groupText); + if (id == null) { + id = groupIdByNameOrId.get(normalizeHeaderKey(groupText)); + } + return id; + } + + private void loadGroups() { + if (groupsLoaded) { + return; + } + List groups = shopManageGroupService.listAccessible(operatorId, superAdmin); + for (ShopManageGroupItemVo group : groups) { + if (group.getId() == null || group.getId() <= 0) { + continue; + } + groupIdByNameOrId.put(String.valueOf(group.getId()), group.getId()); + groupIdByNameOrId.put(normalizeHeaderKey(group.getGroupName()), group.getId()); + } + groupsLoaded = true; + } + + private Integer findGroupIndex() { + return firstHeader("分组id", "分组", "groupid", "group"); + } + + private Integer findShopIndex() { + return firstHeader("店铺名", "店铺名称", "shopname", "shop"); + } + + private Integer findCountryIndex(String country) { + return switch (country) { + case "DE" -> firstHeader("德国", "德", "de", "asinde"); + case "UK" -> firstHeader("英国", "英", "uk", "asinuk"); + case "FR" -> firstHeader("法国", "法", "fr", "asinfr"); + case "IT" -> firstHeader("意大利", "意", "it", "asinit"); + case "ES" -> firstHeader("西班牙", "西", "es", "asines"); + default -> null; + }; + } + + private Integer firstHeader(String... names) { + for (String name : names) { + Integer index = headerIndexByKey.get(normalizeHeaderKey(name)); + if (index != null) { + return index; + } + } + return null; + } + + private String cell(Map rowMap, Integer index) { + if (rowMap == null || index == null) { + return ""; + } + return normalizeExcelText(rowMap.get(index)); + } + + private void updateProgress() { + progress.setAsinCount(asinCount); + progress.setInsertedCount(insertedCount); + progress.setDeletedCount(deletedCount); + progress.setSkippedCount(skippedCount); + } + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupService.java index 7aae45f..6ced207 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageGroupService.java @@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper; import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity; +import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper; import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper; import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMemberMapper; import com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper; import com.nanri.aiimage.modules.shopkey.mapper.SkipPriceAsinMapper; import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupCreateRequest; import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupUpdateRequest; +import com.nanri.aiimage.modules.shopkey.model.entity.QueryAsinEntity; import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageEntity; import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity; import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupMemberEntity; @@ -35,6 +37,7 @@ public class ShopManageGroupService { private final ShopManageGroupMapper groupMapper; private final ShopManageGroupMemberMapper groupMemberMapper; private final ShopManageMapper shopManageMapper; + private final QueryAsinMapper queryAsinMapper; private final SkipPriceAsinMapper skipPriceAsinMapper; private final AdminUserMapper adminUserMapper; @@ -128,6 +131,11 @@ public class ShopManageGroupService { if (skipPriceAsinCount != null && skipPriceAsinCount > 0) { throw new BusinessException("该分组下存在跳过跟价 ASIN，无法删除"); } + Long queryAsinCount = queryAsinMapper.selectCount(new LambdaQueryWrapper() + .eq(QueryAsinEntity::getGroupId, entity.getId())); + if (queryAsinCount != null && queryAsinCount > 0) { + throw new BusinessException("该分组下存在查询 ASIN，无法删除"); + } groupMemberMapper.delete(new LambdaQueryWrapper() .eq(ShopManageGroupMemberEntity::getGroupId, entity.getId())); groupMapper.deleteById(entity.getId()); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskScopePayloadStorageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskScopePayloadStorageService.java index f9d4971..362f1c4 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskScopePayloadStorageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskScopePayloadStorageService.java @@ -34,7 +34,8 @@ public class TaskScopePayloadStorageService { "SHOP_MATCH", "PRODUCT_RISK_RESOLVE", "PRICE_TRACK", - "PATROL_DELETE" + "PATROL_DELETE", + "QUERY_ASIN" )); private static final String OSS_POINTER_PREFIX = "oss:"; private static final String LOCAL_BUFFER_DIR = "task-scope-buffer"; diff --git a/backend-java/src/main/resources/db/V31__query_asin.sql b/backend-java/src/main/resources/db/V31__query_asin.sql new file mode 100644 index 0000000..590218d --- /dev/null +++ b/backend-java/src/main/resources/db/V31__query_asin.sql @@ -0,0 +1,28 @@ +CREATE TABLE IF NOT EXISTS biz_query_asin ( + id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键', + group_id BIGINT NOT NULL COMMENT '分组ID', + shop_name VARCHAR(128) NOT NULL COMMENT '店铺名', + asin_de VARCHAR(64) NOT NULL DEFAULT '' COMMENT '德国 ASIN', + asin_uk VARCHAR(64) NOT NULL DEFAULT '' COMMENT '英国 ASIN', + asin_fr VARCHAR(64) NOT NULL DEFAULT '' COMMENT '法国 ASIN', + asin_it VARCHAR(64) NOT NULL DEFAULT '' COMMENT '意大利 ASIN', + asin_es VARCHAR(64) NOT NULL DEFAULT '' COMMENT '西班牙 ASIN', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + KEY idx_group_shop_name (group_id, shop_name), + KEY idx_shop_name (shop_name), + KEY idx_created_at (created_at) +) COMMENT='查询 ASIN'; + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`) +SELECT '查询ASIN', 'admin_query_asin', 'admin', 'query-asin', 65 +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_query_asin' +); + +UPDATE `columns` +SET `name` = '查询ASIN', + `menu_type` = 'admin', + `route_path` = 'query-asin', + `sort_order` = 65 +WHERE `column_key` = 'admin_query_asin'; diff --git a/backend-java/src/main/resources/db/V32__query_asin_allow_multiple_rows_per_shop.sql b/backend-java/src/main/resources/db/V32__query_asin_allow_multiple_rows_per_shop.sql new file mode 100644 index 0000000..9deca9e --- /dev/null +++ b/backend-java/src/main/resources/db/V32__query_asin_allow_multiple_rows_per_shop.sql @@ -0,0 +1,32 @@ +SET @schema_name = DATABASE(); + +SET @sql = IF( + EXISTS ( + SELECT 1 + FROM information_schema.STATISTICS + WHERE TABLE_SCHEMA = @schema_name + AND TABLE_NAME = 'biz_query_asin' + AND INDEX_NAME = 'uk_group_shop_name' + AND NON_UNIQUE = 0 + ), + 'ALTER TABLE biz_query_asin DROP INDEX uk_group_shop_name', + 'SELECT 1' +); +PREPARE stmt FROM @sql; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +SET @sql = IF( + EXISTS ( + SELECT 1 + FROM information_schema.STATISTICS + WHERE TABLE_SCHEMA = @schema_name + AND TABLE_NAME = 'biz_query_asin' + AND INDEX_NAME = 'idx_group_shop_name' + ), + 'SELECT 1', + 'ALTER TABLE biz_query_asin ADD KEY idx_group_shop_name (group_id, shop_name)' +); +PREPARE stmt FROM @sql; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; diff --git a/backend-java/src/main/resources/db/V33__query_asin_task_candidate.sql b/backend-java/src/main/resources/db/V33__query_asin_task_candidate.sql new file mode 100644 index 0000000..ada105f --- /dev/null +++ b/backend-java/src/main/resources/db/V33__query_asin_task_candidate.sql @@ -0,0 +1,8 @@ +CREATE TABLE IF NOT EXISTS biz_query_asin_shop_candidate ( + id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键', + user_id BIGINT NOT NULL COMMENT '用户ID', + shop_name VARCHAR(128) NOT NULL COMMENT '店铺名', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + UNIQUE KEY uk_user_shop_name (user_id, shop_name), + KEY idx_user_id (user_id) +) COMMENT='查询 ASIN 前台备选店铺'; diff --git a/backend/__pycache__/config.cpython-312.pyc b/backend/__pycache__/config.cpython-312.pyc index 7a86814bf5f8b7dec144efe63071f85c9cfb9d87..0ea50cdc4893afdba2e69d0b8649c4c8fe691f61 100644 GIT binary patch delta 20 acmaFH{fwLYG%qg~0}uo}eYuhQHY)%^>jswq delta 20 acmaFH{fwLYG%qg~0}xDfd9jiEHY)%?=LR+a diff --git a/backend/blueprints/admin_api.py b/backend/blueprints/admin_api.py index 8826a2a..a62ddd2 100644 --- a/backend/blueprints/admin_api.py +++ b/backend/blueprints/admin_api.py @@ -60,6 +60,11 @@ ADMIN_MENU_ACCESS_CONFIG = { 'route_path': 'skip-price-asin', 'error': '无权访问跳过跟价 ASIN 模块', }, + 'query-asin': { + 'column_key': 'admin_query_asin', + 'route_path': 'query-asin', + 'error': '无权访问查询 ASIN 模块', + }, } ADMIN_MENU_ACCESS_CONFIG.update({ @@ -98,10 +103,10 @@ def _safe_version_key(version): return s or 'unknown' -def _proxy_backend_java(method, path, *, params=None, json_data=None, files=None, data=None): +def _proxy_backend_java(method, path, *, params=None, json_data=None, files=None, data=None, timeout=10): url = f"{backend_java_base_url}{path}" try: - resp = requests.request(method=method, url=url, params=params, json=json_data, files=files, data=data, timeout=10) + resp = requests.request(method=method, url=url, params=params, json=json_data, files=files, data=data, timeout=timeout) except requests.RequestException: return None, jsonify({'success': False, 'error': 'backend-java 服务不可用'}), 502 try: @@ -469,7 +474,7 @@ def list_users(): if not role: return jsonify({'success': False, 'error': '需要登录'}), 403 page = max(1, int(request.args.get('page', 1))) - _, _, denied = _ensure_backend_menu_access('users', 'history', 'shop-manage', 'skip-price-asin') + _, _, denied = _ensure_backend_menu_access('users', 'history', 'shop-manage', 'skip-price-asin', 'query-asin') if denied: return denied page_size = min(999, max(5, int(request.args.get('page_size', 15)))) @@ -1436,7 +1441,7 @@ def delete_dedupe_total_data(item_id): @admin_api.route('/shop-manages') @login_required def list_shop_manages(): - role, current_row, denied = _ensure_backend_menu_access('shop-manage') + role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin', 'query-asin') if denied: return denied page = max(1, int(request.args.get('page', 1))) @@ -1600,7 +1605,7 @@ def delete_shop_manage(item_id): @admin_api.route('/shop-manage-groups') @login_required def list_shop_manage_groups(): - role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin') + role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin', 'query-asin') if denied: return denied params = {} @@ -1638,7 +1643,7 @@ def list_shop_manage_groups(): @admin_api.route('/shop-manage-group', methods=['POST']) @login_required def create_shop_manage_group(): - role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin') + role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin', 'query-asin') if denied: return denied data = request.get_json() or {} @@ -1683,7 +1688,7 @@ def create_shop_manage_group(): @admin_api.route('/shop-manage-group/', methods=['PUT']) @login_required def update_shop_manage_group(item_id): - role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin') + role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin', 'query-asin') if denied: return denied data = request.get_json() or {} @@ -1876,7 +1881,7 @@ def delete_skip_price_asin_country(item_id, country): @admin_api.route('/shop-manage-group/', methods=['DELETE']) @login_required def delete_shop_manage_group(item_id): - role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin') + role, current_row, denied = _ensure_backend_menu_access('shop-manage', 'skip-price-asin', 'query-asin') if denied: return denied result, error_response, status = _proxy_backend_java( @@ -1937,3 +1942,269 @@ def update_skip_price_asin_country(item_id, country): 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], }, }) + + +def _format_query_asin_item(item): + return { + 'id': item.get('id'), + 'group_id': item.get('groupId'), + 'group_name': item.get('groupName') or '', + 'shop_name': item.get('shopName') or '', + 'asin_de': item.get('asinDe') or '', + 'asin_uk': item.get('asinUk') or '', + 'asin_fr': item.get('asinFr') or '', + 'asin_it': item.get('asinIt') or '', + 'asin_es': item.get('asinEs') or '', + 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], + 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], + } + + +@admin_api.route('/query-asins') +@login_required +def list_query_asins(): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + page = max(1, int(request.args.get('page', 1))) + page_size = min(100, max(1, int(request.args.get('page_size', 15)))) + group_id_raw = (request.args.get('group_id') or '').strip() + shop_name = (request.args.get('shop_name') or '').strip() + asin = (request.args.get('asin') or '').strip() + params = {'page': page, 'pageSize': page_size} + if current_row and current_row.get('id'): + params['operatorId'] = current_row.get('id') + params['superAdmin'] = 'true' if role == 'super_admin' else 'false' + if group_id_raw: + try: + group_id = int(group_id_raw) + if group_id > 0: + params['groupId'] = group_id + except (TypeError, ValueError): + pass + if shop_name: + params['shopName'] = shop_name + if asin: + params['asin'] = asin + result, error_response, status = _proxy_backend_java( + 'GET', + '/api/admin/query-asins', + params=params, + ) + if error_response is not None: + return error_response, status + payload = result.get('data') or {} + return jsonify({ + 'success': True, + 'items': [_format_query_asin_item(item) for item in (payload.get('items') or [])], + 'total': payload.get('total') or 0, + 'page': payload.get('page') or page, + 'page_size': payload.get('pageSize') or page_size, + }) + + +def _format_query_asin_import_progress(progress): + return { + 'status': progress.get('status') or 'pending', + 'total_rows': progress.get('totalRows') or 0, + 'processed_rows': progress.get('processedRows') or 0, + 'asin_count': progress.get('asinCount') or 0, + 'inserted_count': progress.get('insertedCount') or 0, + 'deleted_count': progress.get('deletedCount') or 0, + 'skipped_count': progress.get('skippedCount') or 0, + 'error_message': progress.get('errorMessage') or '', + } + + +@admin_api.route('/query-asins/import/') +@login_required +def query_asin_import_progress(import_id): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + result, error_response, status = _proxy_backend_java( + 'GET', + f'/api/admin/query-asins/import/{import_id}', + ) + if error_response is not None: + return error_response, status + return jsonify({ + 'success': True, + 'progress': _format_query_asin_import_progress(result.get('data') or {}), + }) + + +@admin_api.route('/query-asins/import', methods=['POST']) +@login_required +def import_query_asins(): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + file_storage = request.files.get('file') + if not file_storage or file_storage.filename == '': + return jsonify({'success': False, 'error': '请选择 Excel 文件'}) + group_id_raw = (request.form.get('group_id') or '').strip() + params = { + 'operatorId': current_row.get('id') if current_row else None, + 'superAdmin': 'true' if role == 'super_admin' else 'false', + } + if group_id_raw: + params['groupId'] = group_id_raw + files = { + 'file': (file_storage.filename, file_storage.stream, file_storage.mimetype or 'application/octet-stream') + } + result, error_response, status = _proxy_backend_java( + 'POST', + '/api/admin/query-asins/import', + params=params, + files=files, + timeout=60, + ) + if error_response is not None: + return error_response, status + summary = result.get('data') or {} + return jsonify({ + 'success': True, + 'msg': result.get('message') or '开始导入', + 'import_id': summary.get('importId') or '', + }) + + +@admin_api.route('/query-asins/delete-import/') +@login_required +def query_asin_delete_import_progress(import_id): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + result, error_response, status = _proxy_backend_java( + 'GET', + f'/api/admin/query-asins/delete-import/{import_id}', + ) + if error_response is not None: + return error_response, status + return jsonify({ + 'success': True, + 'progress': _format_query_asin_import_progress(result.get('data') or {}), + }) + + +@admin_api.route('/query-asins/delete-import', methods=['POST']) +@login_required +def delete_import_query_asins(): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + file_storage = request.files.get('file') + if not file_storage or file_storage.filename == '': + return jsonify({'success': False, 'error': '请选择 Excel 文件'}) + group_id_raw = (request.form.get('group_id') or '').strip() + params = { + 'operatorId': current_row.get('id') if current_row else None, + 'superAdmin': 'true' if role == 'super_admin' else 'false', + } + if group_id_raw: + params['groupId'] = group_id_raw + files = { + 'file': (file_storage.filename, file_storage.stream, file_storage.mimetype or 'application/octet-stream') + } + result, error_response, status = _proxy_backend_java( + 'POST', + '/api/admin/query-asins/delete-import', + params=params, + files=files, + timeout=60, + ) + if error_response is not None: + return error_response, status + summary = result.get('data') or {} + return jsonify({ + 'success': True, + 'msg': result.get('message') or '开始删除', + 'import_id': summary.get('importId') or '', + }) + + +@admin_api.route('/query-asin', methods=['POST']) +@login_required +def create_query_asin(): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + data = request.get_json() or {} + asin_mappings = data.get('asin_mappings') or {} + fallback_asin = (data.get('asin') or '').strip() + if not fallback_asin and isinstance(asin_mappings, dict): + for value in asin_mappings.values(): + fallback_asin = (value or '').strip() + if fallback_asin: + break + payload = { + 'groupId': data.get('group_id'), + 'shopName': (data.get('shop_name') or '').strip(), + 'countries': data.get('countries') or [], + 'asin': fallback_asin, + 'asinMappings': asin_mappings, + } + result, error_response, status = _proxy_backend_java( + 'POST', + '/api/admin/query-asins', + params={ + 'operatorId': current_row.get('id') if current_row else None, + 'superAdmin': 'true' if role == 'super_admin' else 'false', + }, + json_data=payload, + ) + if error_response is not None: + return error_response, status + return jsonify({ + 'success': True, + 'msg': result.get('message') or '保存成功', + 'item': _format_query_asin_item(result.get('data') or {}), + }) + + +@admin_api.route('/query-asin//country/', methods=['DELETE']) +@login_required +def delete_query_asin_country(item_id, country): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + result, error_response, status = _proxy_backend_java( + 'DELETE', + f'/api/admin/query-asins/{item_id}/countries/{country}', + params={ + 'operatorId': current_row.get('id') if current_row else None, + 'superAdmin': 'true' if role == 'super_admin' else 'false', + }, + ) + if error_response is not None: + return error_response, status + return jsonify({'success': True, 'msg': result.get('message') or '删除成功'}) + + +@admin_api.route('/query-asin//country/', methods=['PUT']) +@login_required +def update_query_asin_country(item_id, country): + role, current_row, denied = _ensure_backend_menu_access('query-asin') + if denied: + return denied + data = request.get_json() or {} + payload = { + 'asin': (data.get('asin') or '').strip(), + } + result, error_response, status = _proxy_backend_java( + 'PUT', + f'/api/admin/query-asins/{item_id}/countries/{country}', + params={ + 'operatorId': current_row.get('id') if current_row else None, + 'superAdmin': 'true' if role == 'super_admin' else 'false', + }, + json_data=payload, + ) + if error_response is not None: + return error_response, status + return jsonify({ + 'success': True, + 'msg': result.get('message') or '保存成功', + 'item': _format_query_asin_item(result.get('data') or {}), + }) diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 875370d..051083d 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -413,6 +413,7 @@
店铺密钥管理
店铺管理
跳过跟价 ASIN
+
查询 ASIN
查看生成记录
版本管理
@@ -817,6 +818,120 @@ +
+
+

新增查询 ASIN

+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ + +
+
+ +
+
请选择国家后输入对应 ASIN
+
+
+ +
+

+
+
+

导入添加

+
+
+ + +
+ +
+

+ +
+
+

导入删除

+
+
+ + +
+ +
+

+ +
+
+
+
+

店铺列表

+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + + + + + + + + + + + + + +
序号分组店铺名德国英国法国意大利西班牙
+ +
+
+

筛选条件

@@ -1063,6 +1178,69 @@
+ + + +