diff --git a/app/amazon/__pycache__/approve.cpython-312.pyc b/app/amazon/__pycache__/approve.cpython-312.pyc index 99830ef..af79784 100644 Binary files a/app/amazon/__pycache__/approve.cpython-312.pyc and b/app/amazon/__pycache__/approve.cpython-312.pyc differ diff --git a/app/amazon/__pycache__/del_brand.cpython-312.pyc b/app/amazon/__pycache__/del_brand.cpython-312.pyc index b1eb189..eabb299 100644 Binary files a/app/amazon/__pycache__/del_brand.cpython-312.pyc and b/app/amazon/__pycache__/del_brand.cpython-312.pyc differ diff --git a/app/amazon/__pycache__/main.cpython-312.pyc b/app/amazon/__pycache__/main.cpython-312.pyc index 3d9cbe0..1a9e82f 100644 Binary files a/app/amazon/__pycache__/main.cpython-312.pyc and b/app/amazon/__pycache__/main.cpython-312.pyc differ diff --git a/app/amazon/__pycache__/match_action.cpython-312.pyc b/app/amazon/__pycache__/match_action.cpython-312.pyc index 4aa5da0..6555d3d 100644 Binary files a/app/amazon/__pycache__/match_action.cpython-312.pyc and b/app/amazon/__pycache__/match_action.cpython-312.pyc differ diff --git a/app/amazon/__pycache__/tool.cpython-312.pyc b/app/amazon/__pycache__/tool.cpython-312.pyc index f2537c6..eceb0cd 100644 Binary files a/app/amazon/__pycache__/tool.cpython-312.pyc and b/app/amazon/__pycache__/tool.cpython-312.pyc differ 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 bf00c99..3645a2e 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 @@ -6,12 +6,19 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; +import java.util.List; + @Component @RequiredArgsConstructor @Slf4j public class PermissionMenuSchemaInitializer { private final JdbcTemplate jdbcTemplate; + private static final List DEFAULT_ADMIN_MENUS = List.of( + new DefaultAdminMenu("数据去重总数据", "admin_dedupe_total_data", "dedupe-total-data"), + new DefaultAdminMenu("店铺管理", "admin_shop_manage", "shop-manage"), + new DefaultAdminMenu("跳过跟价ASIN", "admin_skip_price_asin", "skip-price-asin") + ); @PostConstruct public void initialize() { @@ -27,6 +34,7 @@ public class PermissionMenuSchemaInitializer { executeQuietly("ALTER TABLE columns ADD COLUMN menu_type VARCHAR(20) NOT NULL DEFAULT 'app' COMMENT '菜单类型: app/admin' AFTER column_key"); executeQuietly("ALTER TABLE columns ADD COLUMN route_path VARCHAR(255) NOT NULL DEFAULT '' COMMENT '菜单路由或页面标识' AFTER menu_type"); executeQuietly("UPDATE columns SET menu_type = 'app' WHERE menu_type IS NULL OR menu_type = ''"); + ensureDefaultAdminMenus(); executeQuietly(""" INSERT INTO columns (name, column_key, menu_type, route_path) SELECT '店铺管理', 'admin_shop_manage', 'admin', 'shop-manage' @@ -45,6 +53,18 @@ public class PermissionMenuSchemaInitializer { """); } + private void ensureDefaultAdminMenus() { + for (DefaultAdminMenu menu : DEFAULT_ADMIN_MENUS) { + executeQuietly(""" + INSERT INTO columns (name, column_key, menu_type, route_path) + SELECT '%s', '%s', 'admin', '%s' + WHERE NOT EXISTS ( + SELECT 1 FROM columns WHERE column_key = '%s' + ) + """.formatted(menu.name(), menu.columnKey(), menu.routePath(), menu.columnKey())); + } + } + private void executeQuietly(String sql) { try { jdbcTemplate.execute(sql); @@ -52,4 +72,7 @@ public class PermissionMenuSchemaInitializer { log.debug("[permission-menu] schema init skipped: {}", ex.getMessage()); } } + + private record DefaultAdminMenu(String name, String columnKey, String routePath) { + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java new file mode 100644 index 0000000..fadfbe9 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/SkipPriceAsinController.java @@ -0,0 +1,55 @@ +package com.nanri.aiimage.modules.shopkey.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinItemVo; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinPageVo; +import com.nanri.aiimage.modules.shopkey.service.SkipPriceAsinService; +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/admin/skip-price-asins") +@Tag(name = "跳过跟价 ASIN", description = "维护店铺按国家跳过跟价的 ASIN") +public class SkipPriceAsinController { + + private final SkipPriceAsinService skipPriceAsinService; + + @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) { + return ApiResponse.success(skipPriceAsinService.page(page, pageSize, groupId, shopName, asin)); + } + + @PostMapping + @Operation(summary = "新增或覆盖跳过跟价 ASIN") + public ApiResponse create(@Valid @RequestBody SkipPriceAsinCreateRequest request) { + return ApiResponse.success("保存成功", skipPriceAsinService.createOrUpdate(request)); + } + + @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) { + skipPriceAsinService.deleteCountry(id, country); + return ApiResponse.success("删除成功", null); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java new file mode 100644 index 0000000..6274f42 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/mapper/SkipPriceAsinMapper.java @@ -0,0 +1,9 @@ +package com.nanri.aiimage.modules.shopkey.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.shopkey.model.entity.SkipPriceAsinEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SkipPriceAsinMapper extends BaseMapper { +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java new file mode 100644 index 0000000..537d03e --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/SkipPriceAsinCreateRequest.java @@ -0,0 +1,24 @@ +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; + +@Data +public class SkipPriceAsinCreateRequest { + + @NotNull(message = "分组不能为空") + private Long groupId; + + @NotBlank(message = "店铺名不能为空") + private String shopName; + + @NotEmpty(message = "请至少选择一个国家") + private List countries; + + @NotBlank(message = "ASIN 不能为空") + private String asin; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.java new file mode 100644 index 0000000..63cc68d --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/SkipPriceAsinEntity.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_skip_price_asin") +public class SkipPriceAsinEntity { + + @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/SkipPriceAsinItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinItemVo.java new file mode 100644 index 0000000..963db9a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinItemVo.java @@ -0,0 +1,21 @@ +package com.nanri.aiimage.modules.shopkey.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class SkipPriceAsinItemVo { + + 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/SkipPriceAsinPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinPageVo.java new file mode 100644 index 0000000..71de8ff --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/SkipPriceAsinPageVo.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 SkipPriceAsinPageVo { + + 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/SkipPriceAsinService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java new file mode 100644 index 0000000..199c2fb --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/SkipPriceAsinService.java @@ -0,0 +1,212 @@ +package com.nanri.aiimage.modules.shopkey.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.shopkey.mapper.SkipPriceAsinMapper; +import com.nanri.aiimage.modules.shopkey.model.dto.SkipPriceAsinCreateRequest; +import com.nanri.aiimage.modules.shopkey.model.entity.ShopManageGroupEntity; +import com.nanri.aiimage.modules.shopkey.model.entity.SkipPriceAsinEntity; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinItemVo; +import com.nanri.aiimage.modules.shopkey.model.vo.SkipPriceAsinPageVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +@Service +@RequiredArgsConstructor +public class SkipPriceAsinService { + + private static final List SUPPORTED_COUNTRIES = List.of("DE", "UK", "FR", "IT", "ES"); + + private final SkipPriceAsinMapper skipPriceAsinMapper; + private final ShopManageGroupService shopManageGroupService; + + public SkipPriceAsinPageVo page(long page, long pageSize, Long groupId, String shopName, String asin) { + long safePage = Math.max(page, 1); + long safePageSize = Math.min(Math.max(pageSize, 1), 100); + String safeShopName = normalizeBlank(shopName); + String safeAsin = normalizeBlank(asin); + + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(groupId != null && groupId > 0, SkipPriceAsinEntity::getGroupId, groupId) + .like(!safeShopName.isEmpty(), SkipPriceAsinEntity::getShopName, safeShopName) + .and(!safeAsin.isEmpty(), wrapper -> wrapper + .like(SkipPriceAsinEntity::getAsinDe, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinUk, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinFr, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinIt, safeAsin) + .or().like(SkipPriceAsinEntity::getAsinEs, safeAsin)) + .orderByDesc(SkipPriceAsinEntity::getId); + + Long total = skipPriceAsinMapper.selectCount(query); + List rows = skipPriceAsinMapper + .selectList(query.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize)); + + Map groupNameById = buildGroupNameMap(rows.stream() + .map(SkipPriceAsinEntity::getGroupId) + .filter(id -> id != null && id > 0) + .distinct() + .toList()); + + SkipPriceAsinPageVo vo = new SkipPriceAsinPageVo(); + 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 SkipPriceAsinItemVo createOrUpdate(SkipPriceAsinCreateRequest request) { + ShopManageGroupEntity group = shopManageGroupService.getById(request.getGroupId()); + String shopName = normalizeRequired(request.getShopName(), "店铺名不能为空"); + String asin = normalizeAsin(request.getAsin()); + Set countries = normalizeCountries(request.getCountries()); + + SkipPriceAsinEntity entity = skipPriceAsinMapper.selectOne(new LambdaQueryWrapper() + .eq(SkipPriceAsinEntity::getGroupId, group.getId()) + .eq(SkipPriceAsinEntity::getShopName, shopName) + .last("LIMIT 1")); + if (entity == null) { + entity = new SkipPriceAsinEntity(); + entity.setGroupId(group.getId()); + entity.setShopName(shopName); + } + + for (String country : countries) { + setCountryAsin(entity, country, asin); + } + + if (entity.getId() == null) { + skipPriceAsinMapper.insert(entity); + } else { + skipPriceAsinMapper.updateById(entity); + } + SkipPriceAsinEntity saved = getById(entity.getId()); + return toItemVo(saved, group.getGroupName()); + } + + @Transactional + public void deleteCountry(Long id, String country) { + SkipPriceAsinEntity entity = getById(id); + String normalizedCountry = normalizeCountry(country); + setCountryAsin(entity, normalizedCountry, ""); + if (isEmptyRow(entity)) { + skipPriceAsinMapper.deleteById(entity.getId()); + return; + } + skipPriceAsinMapper.updateById(entity); + } + + private SkipPriceAsinEntity getById(Long id) { + SkipPriceAsinEntity entity = skipPriceAsinMapper.selectById(id); + if (entity == null) { + throw new BusinessException("记录不存在"); + } + return entity; + } + + private SkipPriceAsinItemVo toItemVo(SkipPriceAsinEntity entity, String groupName) { + SkipPriceAsinItemVo vo = new SkipPriceAsinItemVo(); + 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 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(SkipPriceAsinEntity 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(SkipPriceAsinEntity entity) { + return normalizeBlank(entity.getAsinDe()).isEmpty() + && normalizeBlank(entity.getAsinUk()).isEmpty() + && normalizeBlank(entity.getAsinFr()).isEmpty() + && normalizeBlank(entity.getAsinIt()).isEmpty() + && normalizeBlank(entity.getAsinEs()).isEmpty(); + } +} diff --git a/backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql b/backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql new file mode 100644 index 0000000..4b224e7 --- /dev/null +++ b/backend-java/src/main/resources/db/V21__skip_price_asin_and_admin_menu_defaults.sql @@ -0,0 +1,33 @@ +CREATE TABLE IF NOT EXISTS biz_skip_price_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 '更新时间', + UNIQUE KEY uk_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`) +SELECT '数据去重总数据', 'admin_dedupe_total_data', 'admin', 'dedupe-total-data' +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_dedupe_total_data' +); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`) +SELECT '店铺管理', 'admin_shop_manage', 'admin', 'shop-manage' +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_shop_manage' +); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`) +SELECT '跳过跟价ASIN', 'admin_skip_price_asin', 'admin', 'skip-price-asin' +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` WHERE `column_key` = 'admin_skip_price_asin' +); diff --git a/backend/blueprints/__pycache__/admin_api.cpython-312.pyc b/backend/blueprints/__pycache__/admin_api.cpython-312.pyc index df04bc0..df68f2e 100644 Binary files a/backend/blueprints/__pycache__/admin_api.cpython-312.pyc and b/backend/blueprints/__pycache__/admin_api.cpython-312.pyc differ diff --git a/backend/blueprints/admin_api.py b/backend/blueprints/admin_api.py index 00694bb..2988c8e 100644 --- a/backend/blueprints/admin_api.py +++ b/backend/blueprints/admin_api.py @@ -19,6 +19,8 @@ ALLOWED_DEDUPE_TOTAL_DATA_ADMIN_USERNAMES = {'刘丽泓'} def _can_access_dedupe_total_data(role, current_row): + _, _, denied = _ensure_admin_menu_access('dedupe-total-data') + return denied is None if role == 'super_admin': return True if role != 'admin' or not current_row: @@ -27,6 +29,7 @@ def _can_access_dedupe_total_data(role, current_row): def _ensure_dedupe_total_data_access(): + return _ensure_admin_menu_access('dedupe-total-data') role, current_row = get_current_admin_role() if not _can_access_dedupe_total_data(role, current_row): return None, None, (jsonify({'success': False, 'error': '无权限访问数据去重总数据'}), 403) @@ -41,6 +44,24 @@ except ImportError: admin_api = Blueprint('admin_api', __name__, url_prefix='/api/admin') +ADMIN_MENU_ACCESS_CONFIG = { + 'dedupe-total-data': { + 'column_key': 'admin_dedupe_total_data', + 'route_path': 'dedupe-total-data', + 'error': '鏃犳潈闄愯闂暟鎹幓閲嶆€绘暟鎹?', + }, + 'shop-manage': { + 'column_key': 'admin_shop_manage', + 'route_path': 'shop-manage', + 'error': '鏃犳潈闄愯闂簵閾虹鐞嗘ā鍧?', + }, + 'skip-price-asin': { + 'column_key': 'admin_skip_price_asin', + 'route_path': 'skip-price-asin', + 'error': '鏃犳潈闄愯闂烦杩囪窡浠稟SIN 妯″潡', + }, +} + def _safe_version_key(version): """将版本号转为安全的 OSS 对象名部分""" @@ -90,6 +111,47 @@ def _sync_user_column_permissions(user_id, column_ids): return error_response, status +def _get_current_admin_permission_sets(): + user_id = session.get('user_id') + if not user_id: + return set(), set() + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute( + """SELECT c.column_key, c.route_path + FROM user_column_permission ucp + INNER JOIN columns c ON c.id = ucp.column_id + WHERE ucp.user_id = %s AND c.menu_type = 'admin'""", + (user_id,), + ) + rows = cur.fetchall() + finally: + conn.close() + key_set = {(row.get('column_key') or '').strip() for row in rows if (row.get('column_key') or '').strip()} + route_set = {(row.get('route_path') or '').strip() for row in rows if (row.get('route_path') or '').strip()} + return key_set, route_set + + +def _ensure_admin_menu_access(*menu_names): + role, current_row = get_current_admin_role() + if role == 'super_admin': + return role, current_row, None + if role != 'admin' or not current_row: + return role, current_row, (jsonify({'success': False, 'error': '闇€瑕佺鐞嗗憳鏉冮檺'}), 403) + key_set, route_set = _get_current_admin_permission_sets() + for menu_name in menu_names: + config = ADMIN_MENU_ACCESS_CONFIG.get(menu_name) or {} + column_key = (config.get('column_key') or '').strip() + route_path = (config.get('route_path') or '').strip() + if (column_key and column_key in key_set) or (route_path and route_path in route_set): + return role, current_row, None + fallback_menu = menu_names[0] if menu_names else '' + fallback_config = ADMIN_MENU_ACCESS_CONFIG.get(fallback_menu) or {} + error_message = fallback_config.get('error') or '鏃犳潈闄愯闂綋鍓嶆ā鍧?' + return role, current_row, (jsonify({'success': False, 'error': error_message}), 403) + + # ---------- 用户管理 ---------- @admin_api.route('/users') @@ -936,6 +998,9 @@ def delete_dedupe_total_data(item_id): @admin_api.route('/shop-manages') @admin_required def list_shop_manages(): + _, _, denied = _ensure_admin_menu_access('shop-manage') + 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() @@ -986,6 +1051,9 @@ def list_shop_manages(): @admin_api.route('/shop-manage', methods=['POST']) @admin_required def create_shop_manage(): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied data = request.get_json() or {} payload = { 'groupId': data.get('group_id'), @@ -1022,6 +1090,9 @@ def create_shop_manage(): @admin_api.route('/shop-manage/', methods=['PUT']) @admin_required def update_shop_manage(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied data = request.get_json() or {} payload = { 'groupId': data.get('group_id'), @@ -1057,6 +1128,9 @@ def update_shop_manage(item_id): @admin_api.route('/shop-manage/', methods=['DELETE']) @admin_required def delete_shop_manage(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'DELETE', f'/api/admin/shop-manages/{item_id}', @@ -1072,6 +1146,9 @@ def delete_shop_manage(item_id): @admin_api.route('/shop-manage-groups') @admin_required def list_shop_manage_groups(): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'GET', '/api/admin/shop-manages/groups', @@ -1093,6 +1170,9 @@ def list_shop_manage_groups(): @admin_api.route('/shop-manage-group', methods=['POST']) @admin_required def create_shop_manage_group(): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied data = request.get_json() or {} payload = {'groupName': (data.get('group_name') or '').strip()} result, error_response, status = _proxy_backend_java( @@ -1118,6 +1198,9 @@ def create_shop_manage_group(): @admin_api.route('/shop-manage-group/', methods=['PUT']) @admin_required def update_shop_manage_group(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied data = request.get_json() or {} payload = {'groupName': (data.get('group_name') or '').strip()} result, error_response, status = _proxy_backend_java( @@ -1140,9 +1223,123 @@ def update_shop_manage_group(item_id): }) +@admin_api.route('/skip-price-asins') +@admin_required +def list_skip_price_asins(): + _, _, denied = _ensure_admin_menu_access('skip-price-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 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/skip-price-asins', + params=params, + ) + if error_response is not None: + return error_response, status + payload = result.get('data') or {} + items = [ + { + '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], + } + for item in (payload.get('items') or []) + ] + return jsonify({ + 'success': True, + 'items': items, + 'total': payload.get('total') or 0, + 'page': payload.get('page') or page, + 'page_size': payload.get('pageSize') or page_size, + }) + + +@admin_api.route('/skip-price-asin', methods=['POST']) +@admin_required +def create_skip_price_asin(): + _, _, denied = _ensure_admin_menu_access('skip-price-asin') + if denied: + return denied + data = request.get_json() or {} + payload = { + 'groupId': data.get('group_id'), + 'shopName': (data.get('shop_name') or '').strip(), + 'countries': data.get('countries') or [], + 'asin': (data.get('asin') or '').strip(), + } + result, error_response, status = _proxy_backend_java( + 'POST', + '/api/admin/skip-price-asins', + json_data=payload, + ) + if error_response is not None: + return error_response, status + item = result.get('data') or {} + return jsonify({ + 'success': True, + 'msg': result.get('message') or '淇濆瓨鎴愬姛', + 'item': { + '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('/skip-price-asin//country/', methods=['DELETE']) +@admin_required +def delete_skip_price_asin_country(item_id, country): + _, _, denied = _ensure_admin_menu_access('skip-price-asin') + if denied: + return denied + result, error_response, status = _proxy_backend_java( + 'DELETE', + f'/api/admin/skip-price-asins/{item_id}/countries/{country}', + ) + if error_response is not None: + return error_response, status + return jsonify({'success': True, 'msg': result.get('message') or '鍒犻櫎鎴愬姛'}) + + @admin_api.route('/shop-manage-group/', methods=['DELETE']) @admin_required def delete_shop_manage_group(item_id): + _, _, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'DELETE', f'/api/admin/shop-manages/groups/{item_id}', diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 3092098..d450729 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -114,6 +114,7 @@
数据去重总数据
店铺密钥管理
店铺管理
+
跳过跟价 ASIN
查看生成记录
版本管理
@@ -421,6 +422,79 @@ +
+
+

新增 ASIN

+
+
+ +
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+ +
+

+
+
+

店铺列表

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

筛选条件

@@ -627,6 +701,23 @@ diff --git a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue index 691d605..9df24a1 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue @@ -181,10 +181,27 @@ function loadTaskSnapshotsFromStorage() { try { const raw = window.localStorage. function saveTaskSnapshotsToStorage() { setStorageJson(taskSnapshotsStorageKey(), taskSnapshots.value, Object.keys(taskSnapshots.value).length === 0) } function loadMatchedItemsFromStorage() { try { const raw = window.localStorage.getItem(matchedItemsStorageKey()); matchedItems.value = raw ? JSON.parse(raw) : [] } catch { matchedItems.value = [] } } function saveMatchedItemsToStorage() { setStorageJson(matchedItemsStorageKey(), matchedItems.value, matchedItems.value.length === 0) } +function isTaskMissingError(error: unknown) { const message = error instanceof Error ? error.message : String(error || ''); return message.includes('任务不存在') } function syncPollingIdsWithTaskState() { const nextIds = pollingTaskIds.value.filter((taskId) => (taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status) === 'RUNNING'); if (nextIds.length === pollingTaskIds.value.length) return; pollingTaskIds.value = nextIds; savePollingIds() } function addPollingTask(taskId: number) { if (!pollingTaskIds.value.includes(taskId)) { pollingTaskIds.value = [...pollingTaskIds.value, taskId]; savePollingIds() } } function clearDispatchTimer(taskId: number) { const timer = dispatchTimers.get(taskId); if (timer) { window.clearTimeout(timer); dispatchTimers.delete(taskId) } } -function removePollingTask(taskId: number) { clearDispatchTimer(taskId); pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId); delete taskDetails.value[taskId]; savePollingIds(); saveTaskDetailsToStorage() } +function removePollingTask(taskId: number) { + clearDispatchTimer(taskId) + pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId) + delete taskDetails.value[taskId] + if (taskSnapshots.value[taskId]) { + const nextSnapshots = { ...taskSnapshots.value } + delete nextSnapshots[taskId] + taskSnapshots.value = nextSnapshots + saveTaskSnapshotsToStorage() + } + savePollingIds() + saveTaskDetailsToStorage() +} +function removeTaskLocally(taskId: number) { + removePollingTask(taskId) + historyItems.value = historyItems.value.filter((row) => normalizeTaskId(row.taskId) !== taskId) +} function stopPollingTask(taskId: number, keepStatus = true) { pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId); if (!keepStatus) delete taskDetails.value[taskId]; savePollingIds(); saveTaskDetailsToStorage() } function isTaskTerminalStatus(status?: string) { return status === 'SUCCESS' || status === 'FAILED' || status === 'COMPLETED' } function isTaskTerminalById(taskId?: number) { if (!taskId) return false; const status = taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status; return isTaskTerminalStatus(status) } @@ -230,12 +247,12 @@ function restoreScheduledDispatches() { const taskIds = new Set(pollingT function startScheduleHeartbeat() { if (scheduleHeartbeatTimer) return; scheduleHeartbeatTimer = window.setInterval(() => { void pumpScheduledQueue() }, 1000) } function stopScheduleHeartbeat() { if (!scheduleHeartbeatTimer) return; window.clearInterval(scheduleHeartbeatTimer); scheduleHeartbeatTimer = null } function handleScheduleRecovery() { restoreScheduledDispatches(); if (pollingTaskIds.value.length) ensurePolling(true) } -async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { const batch = await getShopMatchTasksBatch(pollingTaskIds.value); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removePollingTask(missingId); delete nextSnapshots[missingId] } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; nextSnapshots[taskId] = detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (isTaskTerminalStatus(status)) { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } +async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { const batch = await getShopMatchTasksBatch(pollingTaskIds.value); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removeTaskLocally(missingId); delete nextSnapshots[missingId]; settledTaskIds.add(missingId) } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; nextSnapshots[taskId] = detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (isTaskTerminalStatus(status)) { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } function getPollIntervalMs() { return document.visibilityState === 'visible' ? 4000 : 10000 } function scheduleNextPoll(immediate = false) { if (pollTimer.value) { if (!immediate) return; window.clearTimeout(pollTimer.value); pollTimer.value = null } const run = async () => { pollTimer.value = null; if (pollingInFlight.value || !pollingTaskIds.value.length) { if (pollingTaskIds.value.length) scheduleNextPoll(); return } pollingInFlight.value = true; try { const { settledTaskIds } = await refreshTaskBatch(); if (settledTaskIds.length) await Promise.allSettled([loadHistory(), loadDashboard()]) } finally { pollingInFlight.value = false } if (pollingTaskIds.value.length) pollTimer.value = window.setTimeout(run, getPollIntervalMs()) }; if (immediate) void run(); else pollTimer.value = window.setTimeout(run, getPollIntervalMs()) } function ensurePolling(immediate = false) { scheduleNextPoll(immediate) } function stopPolling() { if (pollTimer.value) { window.clearTimeout(pollTimer.value); pollTimer.value = null } } -async function waitForTaskTerminal(taskId: number) { while (true) { const batch = await getShopMatchTasksBatch([taskId]); const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { taskSnapshots.value = { ...taskSnapshots.value, [taskId]: detail }; saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return status } await new Promise((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) }) } } +async function waitForTaskTerminal(taskId: number) { while (true) { const batch = await getShopMatchTasksBatch([taskId]); if ((batch.missingTaskIds || []).includes(taskId)) { removeTaskLocally(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return 'FAILED' } const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { taskSnapshots.value = { ...taskSnapshots.value, [taskId]: detail }; saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return status } await new Promise((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) }) } } function resolvedTaskStatus(item: ShopMatchHistoryItem) { const taskId = normalizeTaskId(item.taskId); if (!taskId) return item.taskStatus || ''; return taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status || item.taskStatus || '' } function taskSnapshotOf(item: ShopMatchHistoryItem) { const taskId = normalizeTaskId(item.taskId); return taskId ? taskSnapshots.value[taskId] : undefined } function currentTaskStageText(item: ShopMatchHistoryItem) { const snapshot = taskSnapshotOf(item); const task = snapshot?.task; const stages = task?.scheduleStages || []; if (!stages.length) return ''; const total = stages.length; const activeIndex = typeof task?.activeStageIndex === 'number' ? task.activeStageIndex : undefined; const currentIndex = typeof task?.currentStageIndex === 'number' ? task.currentStageIndex : undefined; if (typeof activeIndex === 'number') return `执行进度: 第 ${activeIndex + 1}/${total} 次执行中`; if (typeof currentIndex === 'number') return `执行进度: 等待第 ${currentIndex + 1}/${total} 次`; return `执行进度: 共 ${total} 次`} @@ -250,10 +267,7 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) { try { if (taskId > 0) { await deleteShopMatchTask(taskId) - removePollingTask(taskId) - historyItems.value = historyItems.value.filter((row) => normalizeTaskId(row.taskId) !== taskId) - delete taskSnapshots.value[taskId] - saveTaskSnapshotsToStorage() + removeTaskLocally(taskId) } else if (resultId > 0) { await deleteShopMatchHistory(resultId) historyItems.value = historyItems.value.filter((row) => Number(row.resultId || 0) !== resultId) @@ -262,7 +276,14 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) { throw new Error('缺少可删除的任务标识') } await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) + ElMessage.success('删除成功') } catch (error) { + if (taskId > 0 && isTaskMissingError(error)) { + removeTaskLocally(taskId) + await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) + ElMessage.success('任务已在服务端删除，本地记录已同步清理') + return + } ElMessage.error(error instanceof Error ? error.message : '删除失败') } }