From d5764f3b504aca828603ae6adbe400da738aafaa Mon Sep 17 00:00:00 2001 From: super <2903208875@qq.com> Date: Fri, 17 Apr 2026 12:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8C=B9=E9=85=8D=E3=80=81?= =?UTF-8?q?=E8=B7=9F=E4=BB=B7=E3=80=81=E6=9D=83=E9=99=90=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/brand.cpython-312.pyc | Bin 35720 -> 35720 bytes .../nanri/aiimage/common/api/ApiResponse.java | 20 +- .../common/exception/BusinessException.java | 11 + .../exception/GlobalExceptionHandler.java | 4 +- .../common/util/ExcelStreamReader.java | 126 + .../config/DeleteBrandProgressProperties.java | 12 +- .../BrandTaskProgressCacheService.java | 67 +- .../brand/service/BrandTaskService.java | 1 + .../convert/service/ConvertRunService.java | 132 +- .../dedupe/service/DedupeRunService.java | 19 +- .../service/DedupeTotalDataService.java | 78 +- .../controller/DeleteBrandRunController.java | 6 + .../service/DeleteBrandRunService.java | 77 + .../service/DeleteBrandStaleTaskService.java | 77 +- .../service/DeleteBrandTaskCacheService.java | 78 +- .../dto/PermissionMenuCreateRequest.java | 2 + .../dto/PermissionMenuUpdateRequest.java | 2 + .../model/entity/AdminUserEntity.java | 4 + .../model/entity/PermissionMenuEntity.java | 1 + .../model/vo/PermissionMenuItemVo.java | 1 + .../PermissionMenuSchemaInitializer.java | 39 +- .../service/PermissionMenuService.java | 33 + .../controller/PriceTrackController.java | 21 +- .../dto/PriceTrackMatchShopsRequest.java | 17 +- .../dto/PriceTrackSubmitResultRequest.java | 54 +- .../model/vo/PriceTrackCreateTaskVo.java | 13 +- .../model/vo/PriceTrackMatchShopsVo.java | 32 +- .../PriceTrackExcelAssemblyService.java | 54 +- .../pricetrack/service/PriceTrackService.java | 24 +- .../service/PriceTrackTaskService.java | 261 +- .../ProductRiskResolveController.java | 6 + .../service/ProductRiskTaskService.java | 24 +- .../controller/ShopManageController.java | 50 +- .../controller/SkipPriceAsinController.java | 38 +- .../dto/ShopManageGroupCreateRequest.java | 6 +- .../dto/ShopManageGroupUpdateRequest.java | 5 + .../model/dto/SkipPriceAsinCreateRequest.java | 10 +- .../model/entity/ShopManageGroupEntity.java | 2 + .../model/vo/ShopManageGroupItemVo.java | 2 + .../service/ShopManageGroupService.java | 109 +- .../shopkey/service/ShopManageService.java | 39 +- .../shopkey/service/SkipPriceAsinService.java | 90 +- .../controller/ShopMatchController.java | 6 + .../service/ShopMatchTaskCacheService.java | 133 +- .../service/ShopMatchTaskService.java | 45 +- .../split/service/SplitRunService.java | 245 +- .../src/main/resources/application.yml | 12 +- .../resources/db/V24__price_track_tables.sql | 14 + .../db/V25__permission_menu_sort_order.sql | 6 + .../db/V25__shop_manage_group_bind_user.sql | 55 + backend/__pycache__/config.cpython-312.pyc | Bin 1510 -> 1510 bytes .../__pycache__/admin_api.cpython-312.pyc | Bin 67590 -> 84968 bytes backend/blueprints/admin_api.py | 446 ++- backend/utils/__pycache__/db.cpython-312.pyc | Bin 8233 -> 8671 bytes backend/utils/db.py | 8 + backend/web_source/_admin_extracted.js | 2337 +++++++++++++ backend/web_source/_tmp_prefix.js | 2000 +++++++++++ backend/web_source/admin.html | 2993 +++++++++++------ .../brand/components/BrandDeleteBrandTab.vue | 5 +- .../brand/components/BrandPriceTrackTab.vue | 229 +- .../brand/components/BrandProductRiskTab.vue | 13 +- .../brand/components/BrandShopMatchTab.vue | 62 +- frontend-vue/src/shared/api/java-modules.ts | 75 +- 63 files changed, 8858 insertions(+), 1473 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java create mode 100644 backend-java/src/main/resources/db/V24__price_track_tables.sql create mode 100644 backend-java/src/main/resources/db/V25__permission_menu_sort_order.sql create mode 100644 backend-java/src/main/resources/db/V25__shop_manage_group_bind_user.sql create mode 100644 backend/web_source/_admin_extracted.js create mode 100644 backend/web_source/_tmp_prefix.js diff --git a/app/blueprints/__pycache__/brand.cpython-312.pyc b/app/blueprints/__pycache__/brand.cpython-312.pyc index 2fef1f49d257e0cbc1ceffe9abdfb9bf8346ec55..406fa564102af5abb321eb10829ea4556ef7b6a0 100644 GIT binary patch delta 22 ccmeB}&eSoTiTgA!FBbz41mAtIk-N4V087#b5dZ)H delta 22 ccmeB}&eSoTiTgA!FBbz4v`C-b$X(kF07yOtZ2$lO diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/api/ApiResponse.java b/backend-java/src/main/java/com/nanri/aiimage/common/api/ApiResponse.java index a2db9aa..81bd4a7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/api/ApiResponse.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/api/ApiResponse.java @@ -1,13 +1,11 @@ package com.nanri.aiimage.common.api; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @Data @NoArgsConstructor -@AllArgsConstructor @Schema(description = "统一响应体") public class ApiResponse { @@ -20,6 +18,20 @@ public class ApiResponse { @Schema(description = "响应数据") private T data; + @Schema(description = "业务错误码，成功时可为空") + private Integer code; + + public ApiResponse(boolean success, String message, T data) { + this(success, message, data, null); + } + + public ApiResponse(boolean success, String message, T data, Integer code) { + this.success = success; + this.message = message; + this.data = data; + this.code = code; + } + public static ApiResponse success(T data) { return new ApiResponse<>(true, "操作成功", data); } @@ -31,4 +43,8 @@ public class ApiResponse { public static ApiResponse fail(String message) { return new ApiResponse<>(false, message, null); } + + public static ApiResponse fail(Integer code, String message) { + return new ApiResponse<>(false, message, null, code); + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/exception/BusinessException.java b/backend-java/src/main/java/com/nanri/aiimage/common/exception/BusinessException.java index 0240697..a4d039a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/exception/BusinessException.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/exception/BusinessException.java @@ -2,7 +2,18 @@ package com.nanri.aiimage.common.exception; public class BusinessException extends RuntimeException { + private final Integer code; + public BusinessException(String message) { + this(null, message); + } + + public BusinessException(Integer code, String message) { super(message); + this.code = code; + } + + public Integer getCode() { + return code; } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java b/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java index 3512bc8..73d65c6 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/exception/GlobalExceptionHandler.java @@ -13,7 +13,9 @@ public class GlobalExceptionHandler { @ExceptionHandler(BusinessException.class) public ApiResponse handleBusinessException(BusinessException ex) { - return ApiResponse.fail(ex.getMessage()); + return ex.getCode() == null + ? ApiResponse.fail(ex.getMessage()) + : ApiResponse.fail(ex.getCode(), ex.getMessage()); } @ExceptionHandler(MethodArgumentNotValidException.class) diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java b/backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java new file mode 100644 index 0000000..77725f9 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/common/util/ExcelStreamReader.java @@ -0,0 +1,126 @@ +package com.nanri.aiimage.common.util; + +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.LinkedHashMap; +import java.util.Map; + +public final class ExcelStreamReader { + + private ExcelStreamReader() { + } + + public static void readFirstSheet(File file, SheetRowHandler handler) throws IOException { + try (InputStream inputStream = new FileInputStream(file)) { + readFirstSheet(inputStream, handler); + } + } + + public static void readFirstSheet(InputStream inputStream, SheetRowHandler handler) throws IOException { + runRead(inputStream, false, handler); + } + + public static void readAllSheets(File file, SheetRowHandler handler) throws IOException { + try (InputStream inputStream = new FileInputStream(file)) { + readAllSheets(inputStream, handler); + } + } + + public static void readAllSheets(InputStream inputStream, SheetRowHandler handler) throws IOException { + runRead(inputStream, true, handler); + } + + private static void runRead(InputStream inputStream, boolean readAllSheets, SheetRowHandler handler) throws IOException { + StreamingListener listener = new StreamingListener(handler); + try { + if (readAllSheets) { + EasyExcel.read(inputStream, listener).headRowNumber(1).doReadAll(); + } else { + EasyExcel.read(inputStream, listener).sheet(0).headRowNumber(1).doRead(); + } + } catch (WrappedRuntimeException ex) { + if (ex.getCause() instanceof IOException ioException) { + throw ioException; + } + throw ex; + } + } + + public interface SheetRowHandler { + default void onHeader(String sheetName, Integer sheetNo, Map headerMap) throws Exception { + } + + void onRow(String sheetName, Integer sheetNo, int rowIndex, Map headerMap, Map rowMap) throws Exception; + } + + private static final class StreamingListener extends AnalysisEventListener> { + + private final SheetRowHandler handler; + private Map currentHeaderMap = Map.of(); + + private StreamingListener(SheetRowHandler handler) { + this.handler = handler; + } + + @Override + public void invokeHeadMap(Map headMap, AnalysisContext context) { + Map normalizedHeadMap = new LinkedHashMap<>(); + for (Map.Entry entry : headMap.entrySet()) { + normalizedHeadMap.put(entry.getKey(), entry.getValue()); + } + currentHeaderMap = normalizedHeadMap; + try { + handler.onHeader(sheetName(context), sheetNo(context), currentHeaderMap); + } catch (RuntimeException ex) { + throw ex; + } catch (Exception ex) { + throw new WrappedRuntimeException(ex); + } + } + + @Override + public void invoke(Map data, AnalysisContext context) { + Map normalizedRow = new LinkedHashMap<>(); + for (Map.Entry entry : data.entrySet()) { + normalizedRow.put(entry.getKey(), entry.getValue()); + } + try { + handler.onRow( + sheetName(context), + sheetNo(context), + context.readRowHolder().getRowIndex(), + currentHeaderMap, + normalizedRow + ); + } catch (RuntimeException ex) { + throw ex; + } catch (Exception ex) { + throw new WrappedRuntimeException(ex); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + } + + private String sheetName(AnalysisContext context) { + return context.readSheetHolder() == null ? "" : context.readSheetHolder().getSheetName(); + } + + private Integer sheetNo(AnalysisContext context) { + return context.readSheetHolder() == null ? null : context.readSheetHolder().getSheetNo(); + } + } + + private static final class WrappedRuntimeException extends RuntimeException { + private WrappedRuntimeException(Throwable cause) { + super(cause); + } + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/DeleteBrandProgressProperties.java b/backend-java/src/main/java/com/nanri/aiimage/config/DeleteBrandProgressProperties.java index b3500b0..b7e4a78 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/DeleteBrandProgressProperties.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/DeleteBrandProgressProperties.java @@ -18,18 +18,18 @@ public class DeleteBrandProgressProperties { * 商品风险（PRODUCT_RISK_RESOLVE）RUNNING 超时自动收尾/失败，按分钟计算； * 与删除品牌共用同一定时调度。 */ - private long productRiskStaleTimeoutMinutes = 10; - private long productRiskInitialTimeoutMinutes = 10; + private long productRiskStaleTimeoutMinutes = 20; + private long productRiskInitialTimeoutMinutes = 20; /** * Price track RUNNING timeout auto-finalize/fail threshold in minutes. */ - private long priceTrackStaleTimeoutMinutes = 10; - private long priceTrackInitialTimeoutMinutes = 10; + private long priceTrackStaleTimeoutMinutes = 20; + private long priceTrackInitialTimeoutMinutes = 20; /** * Shop match RUNNING timeout auto-finalize/fail threshold in minutes. */ - private long shopMatchStaleTimeoutMinutes = 10; - private long shopMatchInitialTimeoutMinutes = 10; + private long shopMatchStaleTimeoutMinutes = 20; + private long shopMatchInitialTimeoutMinutes = 20; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java index b5bdd07..b7d0612 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskProgressCacheService.java @@ -9,7 +9,11 @@ import com.nanri.aiimage.modules.brand.model.dto.BrandFileAggregateCacheDto; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; import java.security.MessageDigest; import java.time.Duration; import java.time.Instant; @@ -94,21 +98,28 @@ public class BrandTaskProgressCacheService { public void saveParsedPayload(Long taskId, Object payload) { try { - stringRedisTemplate.opsForValue().set(buildPayloadKey(taskId), objectMapper.writeValueAsString(payload), ttl()); + Files.createDirectories(buildTaskDir(taskId)); + Files.writeString( + buildPayloadFile(taskId), + objectMapper.writeValueAsString(payload), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE + ); } catch (Exception ex) { - throw new BusinessException("暂存品牌原始数据失败"); + throw new BusinessException("鏆傚瓨鍝佺墝鍘熷鏁版嵁澶辫触"); } } public T getParsedPayload(Long taskId, TypeReference typeReference) { - String raw = stringRedisTemplate.opsForValue().get(buildPayloadKey(taskId)); - if (raw == null || raw.isBlank()) { + Path payloadFile = buildPayloadFile(taskId); + if (!Files.isRegularFile(payloadFile)) { return null; } try { - return objectMapper.readValue(raw, typeReference); + return objectMapper.readValue(Files.readString(payloadFile), typeReference); } catch (Exception ex) { - throw new BusinessException("读取品牌原始数据失败"); + throw new BusinessException("璇诲彇鍝佺墝鍘熷鏁版嵁澶辫触"); } } @@ -126,7 +137,7 @@ public class BrandTaskProgressCacheService { int finishedFiles = countCompletedFiles(taskId); return new ChunkStoreResult(false, false, finishedFiles, aggregate); } - throw new BusinessException("同一分片重复提交但内容不一致: " + fileUrl + "#" + file.getChunkIndex()); + throw new BusinessException("鍚屼竴鍒嗙墖閲嶅鎻愪氦浣嗗唴瀹逛笉涓€鑷? " + fileUrl + "#" + file.getChunkIndex()); } BrandFileAggregateCacheDto aggregate = getFileAggregate(taskId, fileUrl); @@ -174,7 +185,7 @@ public class BrandTaskProgressCacheService { try { return objectMapper.readValue(json, BrandFileAggregateCacheDto.class); } catch (Exception ex) { - throw new BusinessException("读取品牌文件聚合缓存失败"); + throw new BusinessException("璇诲彇鍝佺墝鏂囦欢鑱氬悎缂撳瓨澶辫触"); } } @@ -209,11 +220,11 @@ public class BrandTaskProgressCacheService { public void delete(Long taskId) { stringRedisTemplate.delete(buildKey(taskId)); - stringRedisTemplate.delete(buildPayloadKey(taskId)); stringRedisTemplate.delete(buildFileAggregateKey(taskId)); stringRedisTemplate.delete(buildCompletedFilesKey(taskId)); stringRedisTemplate.delete(buildFinalizeLockKey(taskId)); stringRedisTemplate.delete(buildLegacyResultKey(taskId)); + deleteTaskDirQuietly(taskId); } public void deleteFileState(Long taskId, String fileUrl) { @@ -236,19 +247,19 @@ public class BrandTaskProgressCacheService { stringRedisTemplate.opsForHash().put(buildFileAggregateKey(taskId), normalizeFileUrl(aggregate.getFileUrl()), objectMapper.writeValueAsString(aggregate)); refreshTaskKey(buildFileAggregateKey(taskId)); } catch (Exception ex) { - throw new BusinessException("暂存品牌文件聚合结果失败"); + throw new BusinessException("鏆傚瓨鍝佺墝鏂囦欢鑱氬悎缁撴灉澶辫触"); } } private void validateChunk(BrandCrawlResultFileDto file) { if (file == null) { - throw new BusinessException("分片不能为空"); + throw new BusinessException("鍒嗙墖涓嶈兘涓虹┖"); } if (file.getChunkIndex() == null || file.getChunkTotal() == null || file.getChunkIndex() <= 0 || file.getChunkTotal() <= 0 || file.getChunkIndex() > file.getChunkTotal()) { - throw new BusinessException("分片参数不合法"); + throw new BusinessException("鍒嗙墖鍙傛暟涓嶅悎娉?"); } if (file.getFileUrl() == null || file.getFileUrl().isBlank()) { - throw new BusinessException("fileUrl 不能为空"); + throw new BusinessException("fileUrl 涓嶈兘涓虹┖"); } } @@ -270,7 +281,7 @@ public class BrandTaskProgressCacheService { private void ensureChunkConsistency(BrandFileAggregateCacheDto aggregate, BrandCrawlResultFileDto file) { if (aggregate.getChunkTotal() != null && file.getChunkTotal() != null && !aggregate.getChunkTotal().equals(file.getChunkTotal())) { - throw new BusinessException("同一文件的 chunkTotal 不一致: " + aggregate.getFileUrl()); + throw new BusinessException("鍚屼竴鏂囦欢鐨?chunkTotal 涓嶄竴鑷? " + aggregate.getFileUrl()); } if (aggregate.getChunkTotal() == null) { aggregate.setChunkTotal(file.getChunkTotal()); @@ -322,7 +333,7 @@ public class BrandTaskProgressCacheService { } return sb.toString(); } catch (Exception ex) { - throw new BusinessException("计算品牌结果分片摘要失败"); + throw new BusinessException("璁＄畻鍝佺墝缁撴灉鍒嗙墖鎽樿澶辫触"); } } @@ -340,8 +351,28 @@ public class BrandTaskProgressCacheService { return Duration.ofHours(brandProgressProperties.getTtlHours()); } - private String buildPayloadKey(Long taskId) { - return "brand:task:parsed-payload:" + taskId; + private Path buildTaskDir(Long taskId) { + return Path.of(System.getProperty("java.io.tmpdir"), "brand-task-cache", String.valueOf(taskId)); + } + + private Path buildPayloadFile(Long taskId) { + return buildTaskDir(taskId).resolve("parsed-payload.json"); + } + + private void deleteTaskDirQuietly(Long taskId) { + Path taskDir = buildTaskDir(taskId); + if (!Files.exists(taskDir)) { + return; + } + try (var walk = Files.walk(taskDir)) { + walk.sorted(java.util.Comparator.reverseOrder()).forEach(path -> { + try { + Files.deleteIfExists(path); + } catch (IOException ignored) { + } + }); + } catch (IOException ignored) { + } } private String buildFileAggregateKey(Long taskId) { @@ -383,7 +414,7 @@ public class BrandTaskProgressCacheService { } return sb.toString(); } catch (Exception ex) { - throw new BusinessException("生成文件缓存键失败"); + throw new BusinessException("鐢熸垚鏂囦欢缂撳瓨閿け璐?"); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java index 8b8dbc1..f9e7067 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/brand/service/BrandTaskService.java @@ -327,6 +327,7 @@ public class BrandTaskService { if (deleted == 0) { throw new BusinessException("任务不存在或正在执行中无法删除"); } + brandTaskProgressCacheService.delete(taskId); } public String resolveDownloadUrl(Long taskId) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java index b524dde..65a01e6 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/convert/service/ConvertRunService.java @@ -7,6 +7,7 @@ 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.common.util.ExcelStreamReader; import com.nanri.aiimage.config.StorageProperties; import com.nanri.aiimage.modules.convert.model.dto.ConvertRunRequest; import com.nanri.aiimage.modules.convert.model.dto.UploadedSourceFileDto; @@ -19,15 +20,10 @@ 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 lombok.RequiredArgsConstructor; -import org.apache.poi.ss.usermodel.DataFormatter; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; import org.springframework.stereotype.Service; +import java.io.BufferedWriter; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -242,14 +238,30 @@ public class ConvertRunService { private List generateOutputFiles(File inputFile, ConvertTemplateEntity templateEntity) throws IOException { List outputFilenames = resolveOutputFilenames(templateEntity); - List rows = buildTxtRows(inputFile, templateEntity); File outputDir = FileUtil.mkdir(FileUtil.file(storageProperties.getLocalTempDir(), "convert-result")); - List generatedFiles = new ArrayList<>(); + Map writers = new LinkedHashMap<>(); for (String outputFilename : outputFilenames) { File outputFile = buildNamedOutputFile(outputDir, outputFilename); - FileUtil.writeLines(rows, outputFile, StandardCharsets.UTF_8); generatedFiles.add(new GeneratedConvertFile(outputFilename, outputFile)); + writers.put(outputFilename, Files.newBufferedWriter(outputFile.toPath(), StandardCharsets.UTF_8)); + } + try { + streamTxtRowsToOutputs(inputFile, templateEntity, writers); + } finally { + IOException closeException = null; + for (BufferedWriter writer : writers.values()) { + try { + writer.close(); + } catch (IOException ex) { + if (closeException == null) { + closeException = ex; + } + } + } + if (closeException != null) { + throw closeException; + } } return generatedFiles; } @@ -266,7 +278,9 @@ public class ConvertRunService { return List.of(outputFilename); } - private List buildTxtRows(File inputFile, ConvertTemplateEntity templateEntity) throws IOException { + private void streamTxtRowsToOutputs(File inputFile, + ConvertTemplateEntity templateEntity, + Map writers) throws IOException { List requiredColumns = readStringList(templateEntity.getRequiredSourceColumnsJson()); List headerColumns = readStringList(templateEntity.getHeaderColumnsJson()); Map fieldMapping = readStringMap(templateEntity.getFieldMappingJson()); @@ -275,65 +289,60 @@ public class ConvertRunService { int blankHeaderRowsAfterSchema = templateEntity.getBlankHeaderRowsAfterSchema() == null ? 0 : templateEntity.getBlankHeaderRowsAfterSchema(); + long batchId = System.currentTimeMillis(); + int[] rowIndex = new int[]{1}; + boolean[] headerRead = new boolean[]{false}; + Map[] headerMapHolder = new Map[]{null}; - DataFormatter formatter = new DataFormatter(); - try (FileInputStream fis = new FileInputStream(inputFile); - Workbook workbook = WorkbookFactory.create(fis)) { - Sheet sheet = workbook.getSheetAt(0); - Row headerRow = sheet.getRow(0); - if (headerRow == null) { - throw new BusinessException("Excel header row is empty."); - } - - Map headerMap = new LinkedHashMap<>(); - for (int i = 0; i < headerRow.getLastCellNum(); i++) { - String value = normalizeCellText(formatter.formatCellValue(headerRow.getCell(i))); - if (!value.isBlank() && !headerMap.containsKey(value)) { - headerMap.put(value, i); + ExcelStreamReader.readFirstSheet(inputFile, new ExcelStreamReader.SheetRowHandler() { + @Override + public void onHeader(String sheetName, Integer sheetNo, Map headerMap) throws Exception { + Map resolvedHeaderMap = new LinkedHashMap<>(); + for (Map.Entry entry : headerMap.entrySet()) { + String value = normalizeCellText(entry.getValue()); + if (!value.isBlank() && !resolvedHeaderMap.containsKey(value)) { + resolvedHeaderMap.put(value, entry.getKey()); + } + } + List missing = requiredColumns.stream() + .filter(column -> !resolvedHeaderMap.containsKey(column)) + .toList(); + if (!missing.isEmpty()) { + throw new BusinessException("Missing required columns: " + String.join(", ", missing)); + } + headerRead[0] = true; + headerMapHolder[0] = resolvedHeaderMap; + for (String line : preambleLines) { + writeLineToAll(writers, line); + } + writeLineToAll(writers, String.join("\t", headerColumns)); + for (int i = 0; i < blankHeaderRowsAfterSchema; i++) { + writeLineToAll(writers, "\t".repeat(Math.max(0, headerColumns.size() - 1))); } } - List missing = requiredColumns.stream() - .filter(column -> !headerMap.containsKey(column)) - .toList(); - if (!missing.isEmpty()) { - throw new BusinessException("Missing required columns: " + String.join(", ", missing)); - } - - List rows = new ArrayList<>(); - rows.addAll(preambleLines); - rows.add(String.join("\t", headerColumns)); - for (int i = 0; i < blankHeaderRowsAfterSchema; i++) { - rows.add("\t".repeat(Math.max(0, headerColumns.size() - 1))); - } - - long batchId = System.currentTimeMillis(); - int rowIndex = 1; - int asinIndex = headerMap.getOrDefault("ASIN", -1); - for (int rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++) { - Row row = sheet.getRow(rowNum); - if (row == null) { - continue; + @Override + public void onRow(String sheetName, Integer sheetNo, int excelRowIndex, Map headerMap, Map rowMap) throws Exception { + Map resolvedHeaderMap = headerMapHolder[0]; + if (resolvedHeaderMap == null) { + throw new BusinessException("Excel header row is empty."); } - - String asin = asinIndex >= 0 ? normalizeCellText(formatter.formatCellValue(row.getCell(asinIndex))) : ""; + int asinIndex = resolvedHeaderMap.getOrDefault("ASIN", -1); + String asin = asinIndex >= 0 ? normalizeCellText(rowMap.get(asinIndex)) : ""; if (asin.isBlank()) { - continue; + return; } List lineValues = new ArrayList<>(); for (String column : headerColumns) { if ("sku".equals(column)) { - lineValues.add(batchId + "-" + rowIndex); + lineValues.add(batchId + "-" + rowIndex[0]); continue; } if (fieldMapping.containsKey(column)) { String sourceColumn = fieldMapping.get(column); - Integer sourceIndex = headerMap.get(sourceColumn); - String value = sourceIndex == null - ? "" - : normalizeCellText(formatter.formatCellValue(row.getCell(sourceIndex))); - lineValues.add(value); + Integer sourceIndex = resolvedHeaderMap.get(sourceColumn); + lineValues.add(sourceIndex == null ? "" : normalizeCellText(rowMap.get(sourceIndex))); continue; } if (defaults.containsKey(column)) { @@ -343,10 +352,19 @@ public class ConvertRunService { lineValues.add(""); } - rows.add(String.join("\t", lineValues)); - rowIndex++; + writeLineToAll(writers, String.join("\t", lineValues)); + rowIndex[0]++; } - return rows; + }); + if (!headerRead[0]) { + throw new BusinessException("Excel header row is empty."); + } + } + + private void writeLineToAll(Map writers, String line) throws IOException { + for (BufferedWriter writer : writers.values()) { + writer.write(line); + writer.newLine(); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java index c82eff7..11a676a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java @@ -20,7 +20,7 @@ import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; @@ -232,7 +232,7 @@ public class DedupeRunService { DataFormatter formatter = new DataFormatter(); try (FileInputStream fis = new FileInputStream(inputFile); Workbook workbook = org.apache.poi.ss.usermodel.WorkbookFactory.create(fis); - XSSFWorkbook outputWorkbook = new XSSFWorkbook()) { + SXSSFWorkbook outputWorkbook = new SXSSFWorkbook(200)) { Sheet sheet = workbook.getSheetAt(0); Row headerRow = sheet.getRow(0); if (headerRow == null) { @@ -275,7 +275,6 @@ public class DedupeRunService { // The preliminary global scan for mainIdHasSubIdMap was removed. // We now determine subset existence contextually (per group) during the main loop. } - List candidateRows = new ArrayList<>(); Set candidateAsinValues = new HashSet<>(); for (int rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++) { Row row = sheet.getRow(rowNum); @@ -288,7 +287,6 @@ public class DedupeRunService { continue; } } - candidateRows.add(row); if (asinColumnIndex != null) { String asinValue = dedupeTotalDataService.normalizeComparableValueOrBlank(formatter.formatCellValue(row.getCell(asinColumnIndex))); if (!asinValue.isBlank()) { @@ -300,7 +298,17 @@ public class DedupeRunService { Set matchedAsinValues = dedupeTotalDataService.findExistingComparableValues(candidateAsinValues); Set writtenAsinValues = new HashSet<>(); int outputRowIndex = 1; - for (Row row : candidateRows) { + for (int rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++) { + Row row = sheet.getRow(rowNum); + if (row == null) { + continue; + } + if (idColumnIndex != null) { + String idValue = normalizeCellText(formatter.formatCellValue(row.getCell(idColumnIndex))); + if (!shouldKeepId(idValue, keepIntegerIds, keepUnderscoreIds, keepIntegerMainIdsWhenNoSubIds, sheet, rowNum, idColumnIndex, formatter)) { + continue; + } + } if (asinColumnIndex != null) { String asinValue = dedupeTotalDataService.normalizeComparableValueOrBlank(formatter.formatCellValue(row.getCell(asinColumnIndex))); if (!asinValue.isBlank()) { @@ -324,6 +332,7 @@ public class DedupeRunService { try (FileOutputStream fos = new FileOutputStream(outputFile)) { outputWorkbook.write(fos); } + outputWorkbook.dispose(); } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java index 33b623c..763b53e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java @@ -23,7 +23,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.InputStream; +import java.nio.file.Files; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -114,9 +116,9 @@ public class DedupeTotalDataService { importProgressMap.put(importId, progress); try { - byte[] fileBytes = file.getBytes(); + File tempFile = saveMultipartToTempFile(file); String filename = file.getOriginalFilename(); - Thread.ofVirtual().start(() -> runImportTask(importId, fileBytes, filename)); + Thread.ofVirtual().start(() -> runImportTask(importId, tempFile, filename)); } catch (Exception e) { importProgressMap.remove(importId); throw new BusinessException("读取上传文件失败"); @@ -150,9 +152,9 @@ public class DedupeTotalDataService { deleteImportProgressMap.put(importId, progress); try { - byte[] fileBytes = file.getBytes(); + File tempFile = saveMultipartToTempFile(file); String filename = file.getOriginalFilename(); - Thread.ofVirtual().start(() -> runDeleteImportTask(importId, fileBytes, filename)); + Thread.ofVirtual().start(() -> runDeleteImportTask(importId, tempFile, filename)); } catch (Exception e) { deleteImportProgressMap.remove(importId); throw new BusinessException("读取上传文件失败"); @@ -211,6 +213,74 @@ public class DedupeTotalDataService { } } + private void runDeleteImportTask(String importId, File tempFile, String filename) { + DedupeTotalDataImportProgressVo progress = deleteImportProgressMap.get(importId); + if (progress == null) { + return; + } + progress.setStatus("running"); + try (InputStream inputStream = Files.newInputStream(tempFile.toPath())) { + DedupeTotalDataImportVo result = deleteFromExcelInternal(inputStream, filename, progress); + progress.setTotalRows(result.getTotalRows()); + progress.setAsinCount(result.getAsinCount()); + progress.setInsertedCount(result.getInsertedCount()); + progress.setSkippedCount(result.getSkippedCount()); + progress.setProcessedRows(result.getTotalRows()); + progress.setStatus("success"); + } catch (Exception e) { + progress.setStatus("failed"); + progress.setErrorMessage(e instanceof BusinessException ? e.getMessage() : "鍒犻櫎 Excel 鍖归厤鏁版嵁澶辫触"); + } finally { + deleteQuietly(tempFile); + } + } + + private void runImportTask(String importId, File tempFile, String filename) { + DedupeTotalDataImportProgressVo progress = importProgressMap.get(importId); + if (progress == null) { + return; + } + progress.setStatus("running"); + try (InputStream inputStream = Files.newInputStream(tempFile.toPath())) { + DedupeTotalDataImportVo result = importFromExcelInternal(inputStream, filename, progress); + progress.setTotalRows(result.getTotalRows()); + progress.setAsinCount(result.getAsinCount()); + progress.setInsertedCount(result.getInsertedCount()); + progress.setSkippedCount(result.getSkippedCount()); + progress.setProcessedRows(result.getTotalRows()); + progress.setStatus("success"); + } catch (Exception e) { + progress.setStatus("failed"); + progress.setErrorMessage(e instanceof BusinessException ? e.getMessage() : "瀵煎叆 Excel 澶辫触"); + } finally { + deleteQuietly(tempFile); + } + } + + private File saveMultipartToTempFile(MultipartFile file) 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("dedupe-total-data-", suffix); + file.transferTo(tempFile); + return tempFile; + } + + private void deleteQuietly(File file) { + if (file == null) { + return; + } + try { + Files.deleteIfExists(file.toPath()); + } catch (Exception ignored) { + } + } + @Transactional public DedupeTotalDataImportVo importFromExcel(MultipartFile file) { if (file == null || file.isEmpty()) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java index b9492bc..45b895c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/controller/DeleteBrandRunController.java @@ -85,6 +85,12 @@ public class DeleteBrandRunController { return ApiResponse.success(deleteBrandRunService.getTaskDetails(request.getTaskIds())); } + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量获取删除品牌任务进度摘要", description = "仅返回任务基础状态和行进度摘要，用于前端轮询降载。") + public ApiResponse getTaskProgressBatch(@Valid @RequestBody DeleteBrandTaskBatchRequest request) { + return ApiResponse.success(deleteBrandRunService.getTaskProgress(request.getTaskIds())); + } + @GetMapping("/tasks/{taskId}/deletion-status") @Operation(summary = "获取删除品牌任务删除状态", description = "供 Python/插件按 taskId 查询该删除品牌任务是否已被前端删空。") public ApiResponse getTaskDeletionStatus( diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java index c080b5d..1e357ae 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -544,10 +544,87 @@ public class DeleteBrandRunService { return vo; } + public com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskBatchVo getTaskProgress(java.util.List taskIds) { + com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskBatchVo vo = new com.nanri.aiimage.modules.deletebrand.model.vo.DeleteBrandTaskBatchVo(); + if (taskIds == null || taskIds.isEmpty()) { + return vo; + } + + java.util.List normalizedTaskIds = taskIds.stream() + .filter(id -> id != null && id > 0) + .distinct() + .limit(50) + .toList(); + if (normalizedTaskIds.isEmpty()) { + return vo; + } + + java.util.Map cachedTasks = deleteBrandTaskCacheService.getTaskCacheBatch(normalizedTaskIds); + java.util.List missingTaskIds = new java.util.ArrayList<>(); + for (Long taskId : normalizedTaskIds) { + if (!cachedTasks.containsKey(taskId)) { + missingTaskIds.add(taskId); + } + } + + java.util.Map taskById = new java.util.LinkedHashMap<>(cachedTasks); + if (!missingTaskIds.isEmpty()) { + java.util.List dbTasks = fileTaskMapper.selectBatchIds(missingTaskIds).stream() + .filter(task -> task != null && MODULE_TYPE.equals(task.getModuleType())) + .toList(); + for (FileTaskEntity dbTask : dbTasks) { + taskById.put(dbTask.getId(), dbTask); + if ("RUNNING".equals(dbTask.getStatus())) { + deleteBrandTaskCacheService.saveTaskCache(dbTask); + } + } + } + + java.util.Map> progressByTaskId = deleteBrandTaskCacheService.getProgressBatch(normalizedTaskIds); + + for (Long taskId : normalizedTaskIds) { + FileTaskEntity task = taskById.get(taskId); + if (task == null) { + vo.getMissingTaskIds().add(taskId); + continue; + } + vo.getItems().add(buildTaskProgressDetail(task, progressByTaskId.get(taskId))); + } + return vo; + } + private DeleteBrandTaskDetailVo buildTaskDetail(FileTaskEntity task) { return buildTaskDetail(task, null); } + private DeleteBrandTaskDetailVo buildTaskProgressDetail(FileTaskEntity task, java.util.Map progress) { + task = refreshIndexedMatchesIfNeeded(task); + DeleteBrandTaskItemVo taskVo = new DeleteBrandTaskItemVo(); + taskVo.setId(task.getId()); + taskVo.setTaskNo(task.getTaskNo()); + taskVo.setStatus(task.getStatus()); + taskVo.setSourceFileCount(task.getSourceFileCount()); + taskVo.setSuccessFileCount(task.getSuccessFileCount()); + taskVo.setFailedFileCount(task.getFailedFileCount()); + taskVo.setErrorMessage(task.getErrorMessage()); + taskVo.setCreatedAt(task.getCreatedAt()); + taskVo.setUpdatedAt(task.getUpdatedAt()); + taskVo.setFinishedAt(task.getFinishedAt()); + if ("SUCCESS".equals(task.getStatus())) { + taskVo.setDownloadUrl(resolveTaskDownloadUrl(task.getId())); + taskVo.setDownloadFilename(resolveTaskDownloadFilename(task.getId())); + } else { + taskVo.setDownloadUrl(null); + taskVo.setDownloadFilename(null); + } + + DeleteBrandTaskDetailVo detail = new DeleteBrandTaskDetailVo(); + detail.setTask(taskVo); + detail.setLine_progress(buildLineProgress(task.getId(), progress)); + detail.setFileProgress(java.util.List.of()); + return detail; + } + private DeleteBrandTaskDetailVo buildTaskDetail(FileTaskEntity task, java.util.Map progress) { task = refreshIndexedMatchesIfNeeded(task); DeleteBrandTaskItemVo taskVo = new DeleteBrandTaskItemVo(); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java index 703a2ce..a003416 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandStaleTaskService.java @@ -17,10 +17,15 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.FileTime; import java.time.Duration; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; +import java.util.List; import java.util.Map; @Service @@ -34,6 +39,8 @@ public class DeleteBrandStaleTaskService { private static final String MODULE_TYPE_SHOP_MATCH = "SHOP_MATCH"; private static final Duration STALE_CHECK_LOCK_TTL = Duration.ofMinutes(10); private static final Duration FINALIZE_CHECK_LOCK_TTL = Duration.ofMinutes(10); + private static final Duration TEMP_DIR_CLEANUP_LOCK_TTL = Duration.ofMinutes(10); + private static final Duration TEMP_DIR_RETENTION = Duration.ofHours(48); private final FileTaskMapper fileTaskMapper; private final DeleteBrandTaskCacheService deleteBrandTaskCacheService; @@ -289,7 +296,7 @@ public class DeleteBrandStaleTaskService { log.info("[stale-check] shop-match candidates={} threshold={} timeoutMinutes={} initialThreshold={} initialTimeoutMinutes={}", runningTasks.size(), threshold, minutes, initialThreshold, initialMinutes); for (FileTaskEntity task : runningTasks) { - boolean hasUploadedPayload = !shopMatchTaskCacheService.getAllShopMergedPayload(task.getId()).isEmpty(); + boolean hasUploadedPayload = shopMatchTaskCacheService.hasAnyShopMergedPayload(task.getId()); boolean hasFinishedRows = (task.getSuccessFileCount() != null && task.getSuccessFileCount() > 0) || (task.getFailedFileCount() != null && task.getFailedFileCount() > 0); boolean hasStartedProgress = hasUploadedPayload || hasFinishedRows; @@ -352,6 +359,74 @@ public class DeleteBrandStaleTaskService { } } + @Scheduled(cron = "${aiimage.temp-dir.cleanup-cron:15 */30 * * * *}") + public void cleanupExpiredTempDirs() { + DistributedJobLockService.LockHandle lockHandle = + distributedJobLockService.tryLock("temp-dir:cleanup", TEMP_DIR_CLEANUP_LOCK_TTL); + if (lockHandle == null) { + log.info("[temp-dir-cleanup] skip because another instance holds the distributed lock"); + return; + } + try (lockHandle) { + Instant cutoff = Instant.now().minus(TEMP_DIR_RETENTION); + List dirNames = List.of( + "shop-match-cache", + "brand-task-cache", + "delete-brand-task-cache", + "shop-match-result", + "delete-brand-result", + "product-risk-result", + "price-track-result" + ); + for (String dirName : dirNames) { + cleanupTempRoot(dirName, cutoff); + } + } + } + + private void cleanupTempRoot(String dirName, Instant cutoff) { + Path root = Path.of(System.getProperty("java.io.tmpdir"), dirName); + if (!Files.isDirectory(root)) { + return; + } + try (var stream = Files.list(root)) { + for (Path child : stream.toList()) { + try { + FileTime lastModified = Files.getLastModifiedTime(child); + if (lastModified.toInstant().isAfter(cutoff)) { + continue; + } + deleteRecursively(child); + log.info("[temp-dir-cleanup] deleted expired temp path dir={} path={}", dirName, child); + } catch (Exception ex) { + log.warn("[temp-dir-cleanup] delete failed dir={} path={} msg={}", dirName, child, ex.getMessage()); + } + } + } catch (IOException ex) { + log.warn("[temp-dir-cleanup] scan failed dir={} msg={}", dirName, ex.getMessage()); + } + } + + private void deleteRecursively(Path path) throws IOException { + if (!Files.exists(path)) { + return; + } + try (var walk = Files.walk(path)) { + walk.sorted(java.util.Comparator.reverseOrder()).forEach(item -> { + try { + Files.deleteIfExists(item); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + }); + } catch (RuntimeException ex) { + if (ex.getCause() instanceof IOException ioException) { + throw ioException; + } + throw ex; + } + } + private static final class ProductRiskStaleCheckStats { private int scannedTaskCount; private int finalizedTaskCount; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandTaskCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandTaskCacheService.java index 65a8802..75e38ae 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandTaskCacheService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandTaskCacheService.java @@ -7,6 +7,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; import java.time.Duration; import java.util.concurrent.ConcurrentHashMap; @@ -28,10 +31,17 @@ public class DeleteBrandTaskCacheService { public void saveParsedPayload(Long taskId, Object payload) { try { - stringRedisTemplate.opsForValue().set(buildPayloadKey(taskId), objectMapper.writeValueAsString(payload), Duration.ofHours(PAYLOAD_TTL_HOURS)); + Files.createDirectories(buildTaskDir(taskId)); + Files.writeString( + buildPayloadFile(taskId), + objectMapper.writeValueAsString(payload), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE + ); parsedPayloadLocalCache.put(taskId, new LocalParsedPayloadCacheEntry(System.currentTimeMillis(), payload)); } catch (Exception ex) { - throw new BusinessException("暂存删除品牌原始数据失败"); + throw new BusinessException("鏆傚瓨鍒犻櫎鍝佺墝鍘熷鏁版嵁澶辫触"); } } @@ -46,21 +56,21 @@ public class DeleteBrandTaskCacheService { try { return objectMapper.convertValue(cached.value(), typeReference); } catch (Exception ignored) { - // fallthrough to redis + // fall through to file } } - String raw = stringRedisTemplate.opsForValue().get(buildPayloadKey(taskId)); - if (raw == null || raw.isBlank()) { + Path payloadFile = buildPayloadFile(taskId); + if (!Files.isRegularFile(payloadFile)) { parsedPayloadLocalCache.remove(taskId); return null; } try { - T parsed = objectMapper.readValue(raw, typeReference); + T parsed = objectMapper.readValue(Files.readString(payloadFile), typeReference); parsedPayloadLocalCache.put(taskId, new LocalParsedPayloadCacheEntry(now, parsed)); return parsed; } catch (Exception ex) { - throw new BusinessException("读取删除品牌原始数据失败"); + throw new BusinessException("璇诲彇鍒犻櫎鍝佺墝鍘熷鏁版嵁澶辫触"); } } @@ -114,17 +124,17 @@ public class DeleteBrandTaskCacheService { public boolean hasSameResultChunk(Long taskId, String fileIdentity, Integer chunkIndex, Object chunk) { if (chunkIndex == null || chunkIndex <= 0) { - throw new BusinessException("chunkIndex 不合法"); + throw new BusinessException("chunkIndex 涓嶅悎娉?"); } if (fileIdentity == null || fileIdentity.isBlank()) { - throw new BusinessException("fileIdentity 不能为空"); + throw new BusinessException("fileIdentity 涓嶈兘涓虹┖"); } String field = fileIdentity.trim() + "#" + chunkIndex; String chunkJson; try { chunkJson = objectMapper.writeValueAsString(chunk); } catch (Exception ex) { - throw new BusinessException("读取删除品牌结果分片失败"); + throw new BusinessException("璇诲彇鍒犻櫎鍝佺墝缁撴灉鍒嗙墖澶辫触"); } Object existing = stringRedisTemplate.opsForHash().get(buildResultChunksKey(taskId), field); if (chunkJson.equals(existing)) { @@ -137,17 +147,17 @@ public class DeleteBrandTaskCacheService { public boolean mergeResultChunk(Long taskId, String fileIdentity, Integer chunkIndex, Object chunk) { String resultKey = buildResultChunksKey(taskId); if (chunkIndex == null || chunkIndex <= 0) { - throw new BusinessException("chunkIndex 不合法"); + throw new BusinessException("chunkIndex 涓嶅悎娉?"); } if (fileIdentity == null || fileIdentity.isBlank()) { - throw new BusinessException("fileIdentity 不能为空"); + throw new BusinessException("fileIdentity 涓嶈兘涓虹┖"); } String field = fileIdentity.trim() + "#" + chunkIndex; String chunkJson; try { chunkJson = objectMapper.writeValueAsString(chunk); } catch (Exception ex) { - throw new BusinessException("暂存删除品牌结果分片失败"); + throw new BusinessException("鏆傚瓨鍒犻櫎鍝佺墝缁撴灉鍒嗙墖澶辫触"); } Object existing = stringRedisTemplate.opsForHash().get(resultKey, field); if (chunkJson.equals(existing)) { @@ -178,14 +188,16 @@ public class DeleteBrandTaskCacheService { public void delete(Long taskId) { parsedPayloadLocalCache.remove(taskId); - stringRedisTemplate.delete(buildPayloadKey(taskId)); stringRedisTemplate.delete(buildProgressKey(taskId)); stringRedisTemplate.delete(buildResultChunksKey(taskId)); stringRedisTemplate.delete(buildTaskEntityKey(taskId)); + deleteTaskDirQuietly(taskId); } public void saveTaskCache(com.nanri.aiimage.modules.task.model.entity.FileTaskEntity task) { - if (task == null || task.getId() == null) return; + if (task == null || task.getId() == null) { + return; + } try { stringRedisTemplate.opsForValue().set(buildTaskEntityKey(task.getId()), objectMapper.writeValueAsString(task), Duration.ofHours(PAYLOAD_TTL_HOURS)); } catch (Exception ignored) { @@ -194,10 +206,14 @@ public class DeleteBrandTaskCacheService { public java.util.Map getTaskCacheBatch(java.util.List taskIds) { java.util.Map result = new java.util.LinkedHashMap<>(); - if (taskIds == null || taskIds.isEmpty()) return result; + 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; + if (normalized.isEmpty()) { + return result; + } java.util.List keys = normalized.stream().map(this::buildTaskEntityKey).toList(); java.util.List values = stringRedisTemplate.opsForValue().multiGet(keys); @@ -215,6 +231,30 @@ public class DeleteBrandTaskCacheService { return result; } + private Path buildTaskDir(Long taskId) { + return Path.of(System.getProperty("java.io.tmpdir"), "delete-brand-task-cache", String.valueOf(taskId)); + } + + private Path buildPayloadFile(Long taskId) { + return buildTaskDir(taskId).resolve("parsed-payload.json"); + } + + private void deleteTaskDirQuietly(Long taskId) { + Path taskDir = buildTaskDir(taskId); + if (!Files.exists(taskDir)) { + return; + } + try (var walk = Files.walk(taskDir)) { + walk.sorted(java.util.Comparator.reverseOrder()).forEach(path -> { + try { + Files.deleteIfExists(path); + } catch (Exception ignored) { + } + }); + } catch (Exception ignored) { + } + } + private String buildTaskEntityKey(Long taskId) { return "delete-brand:task:entity:" + taskId; } @@ -225,10 +265,6 @@ public class DeleteBrandTaskCacheService { } } - private String buildPayloadKey(Long taskId) { - return "delete-brand:task:parsed-payload:" + taskId; - } - private String buildProgressKey(Long taskId) { return "delete-brand:task:progress:" + taskId; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuCreateRequest.java index b40ab05..4cbdfe7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuCreateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuCreateRequest.java @@ -17,4 +17,6 @@ public class PermissionMenuCreateRequest { @NotBlank(message = "菜单路由不能为空") private String routePath; + + private Integer sortOrder; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuUpdateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuUpdateRequest.java index 38ef597..e2b6927 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuUpdateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuUpdateRequest.java @@ -17,4 +17,6 @@ public class PermissionMenuUpdateRequest { @NotBlank(message = "菜单路由不能为空") private String routePath; + + private Integer sortOrder; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java index b3af65b..9ac7b4e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java @@ -1,6 +1,7 @@ package com.nanri.aiimage.modules.permission.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; @@ -11,5 +12,8 @@ public class AdminUserEntity { @TableId(type = IdType.AUTO) private Long id; + private String username; private String role; + @TableField("created_by_id") + private Long createdById; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/PermissionMenuEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/PermissionMenuEntity.java index c8e4262..cbebbf8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/PermissionMenuEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/PermissionMenuEntity.java @@ -17,5 +17,6 @@ public class PermissionMenuEntity { private String columnKey; private String menuType; private String routePath; + private Integer sortOrder; private LocalDateTime createdAt; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java index 875dc87..2db9e38 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java @@ -12,5 +12,6 @@ public class PermissionMenuItemVo { private String columnKey; private String menuType; private String routePath; + private Integer sortOrder; private LocalDateTime createdAt; } 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 3645a2e..41681e7 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 @@ -14,10 +14,16 @@ import java.util.List; 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") + new DefaultAdminMenu("用户管理", "admin_users", "users", 10), + new DefaultAdminMenu("栏目权限配置", "admin_columns", "columns", 20), + new DefaultAdminMenu("数据去重总数据", "admin_dedupe_total_data", "dedupe-total-data", 30), + 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("查看生成记录", "admin_history", "history", 70), + new DefaultAdminMenu("版本管理", "admin_version", "version", 80) ); @PostConstruct @@ -25,23 +31,19 @@ public class PermissionMenuSchemaInitializer { executeQuietly(""" CREATE TABLE IF NOT EXISTS columns ( id INT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(128) NOT NULL COMMENT '栏目名', - column_key VARCHAR(64) NOT NULL COMMENT '栏目标识', + name VARCHAR(128) NOT NULL COMMENT '菜单标题', + column_key VARCHAR(64) NOT NULL COMMENT '菜单唯一标识', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY uk_column_key (column_key) ) """); 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("ALTER TABLE columns ADD COLUMN sort_order INT NOT NULL DEFAULT 0 COMMENT '菜单排序' AFTER route_path"); executeQuietly("UPDATE columns SET menu_type = 'app' WHERE menu_type IS NULL OR menu_type = ''"); + executeQuietly("UPDATE columns SET sort_order = id WHERE sort_order IS NULL OR sort_order = 0"); + executeQuietly("ALTER TABLE columns ADD UNIQUE KEY uk_menu_type_route_path (menu_type, route_path)"); ensureDefaultAdminMenus(); - executeQuietly(""" - 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' - ) - """); executeQuietly(""" CREATE TABLE IF NOT EXISTS user_column_permission ( user_id INT NOT NULL, @@ -56,12 +58,17 @@ 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' + INSERT INTO columns (name, column_key, menu_type, route_path, sort_order) + SELECT '%s', '%s', 'admin', '%s', %d WHERE NOT EXISTS ( SELECT 1 FROM columns WHERE column_key = '%s' ) - """.formatted(menu.name(), menu.columnKey(), menu.routePath(), menu.columnKey())); + """.formatted(menu.name(), menu.columnKey(), menu.routePath(), menu.sortOrder(), menu.columnKey())); + executeQuietly(""" + UPDATE columns + SET sort_order = %d + WHERE column_key = '%s' AND (sort_order IS NULL OR sort_order = 0) + """.formatted(menu.sortOrder(), menu.columnKey())); } } @@ -73,6 +80,6 @@ public class PermissionMenuSchemaInitializer { } } - private record DefaultAdminMenu(String name, String columnKey, String routePath) { + private record DefaultAdminMenu(String name, String columnKey, String routePath, int sortOrder) { } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java index a0ef8f0..54ed17e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Comparator; import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; @@ -41,6 +42,7 @@ public class PermissionMenuService { public List list(String menuType) { LambdaQueryWrapper query = new LambdaQueryWrapper() .eq(isValidMenuType(menuType), PermissionMenuEntity::getMenuType, normalizeMenuType(menuType)) + .orderByAsc(PermissionMenuEntity::getSortOrder) .orderByAsc(PermissionMenuEntity::getId); return permissionMenuMapper.selectList(query).stream() .map(this::toItemVo) @@ -54,12 +56,14 @@ public class PermissionMenuService { String menuType = normalizeMenuTypeRequired(request.getMenuType()); String routePath = normalizeRequired(request.getRoutePath(), "菜单路由不能为空"); ensureUniqueColumnKey(columnKey, null); + ensureUniqueRoutePath(menuType, routePath, null); PermissionMenuEntity entity = new PermissionMenuEntity(); entity.setName(name); entity.setColumnKey(columnKey); entity.setMenuType(menuType); entity.setRoutePath(routePath); + entity.setSortOrder(resolveSortOrder(request.getSortOrder(), null)); permissionMenuMapper.insert(entity); return toItemVo(getMenuById(entity.getId())); } @@ -72,11 +76,13 @@ public class PermissionMenuService { String menuType = normalizeMenuTypeRequired(request.getMenuType()); String routePath = normalizeRequired(request.getRoutePath(), "菜单路由不能为空"); ensureUniqueColumnKey(columnKey, id); + ensureUniqueRoutePath(menuType, routePath, id); entity.setName(name); entity.setColumnKey(columnKey); entity.setMenuType(menuType); entity.setRoutePath(routePath); + entity.setSortOrder(resolveSortOrder(request.getSortOrder(), id)); permissionMenuMapper.updateById(entity); return toItemVo(getMenuById(id)); } @@ -141,6 +147,9 @@ public class PermissionMenuService { .map(menuMap::get) .filter(menu -> menu != null) .filter(menu -> safeMenuType == null || safeMenuType.equals(menu.getMenuType())) + .sorted(Comparator + .comparing(PermissionMenuEntity::getSortOrder, Comparator.nullsLast(Integer::compareTo)) + .thenComparing(PermissionMenuEntity::getId, Comparator.nullsLast(Long::compareTo))) .map(this::toItemVo) .toList(); } @@ -196,6 +205,16 @@ public class PermissionMenuService { } } + private void ensureUniqueRoutePath(String menuType, String routePath, Long excludeId) { + PermissionMenuEntity exists = permissionMenuMapper.selectOne(new LambdaQueryWrapper() + .eq(PermissionMenuEntity::getMenuType, menuType) + .eq(PermissionMenuEntity::getRoutePath, routePath) + .last("LIMIT 1")); + if (exists != null && (excludeId == null || !excludeId.equals(exists.getId()))) { + throw new BusinessException("同一菜单类型下的菜单路由已存在"); + } + } + private String normalizeRequired(String value, String message) { String normalized = value == null ? "" : value.trim(); if (normalized.isEmpty() && !message.isEmpty()) { @@ -247,7 +266,21 @@ public class PermissionMenuService { vo.setColumnKey(entity.getColumnKey()); vo.setMenuType(entity.getMenuType()); vo.setRoutePath(entity.getRoutePath()); + vo.setSortOrder(entity.getSortOrder()); vo.setCreatedAt(entity.getCreatedAt()); return vo; } + + private Integer resolveSortOrder(Integer sortOrder, Long excludeId) { + if (sortOrder != null) { + return sortOrder; + } + PermissionMenuEntity tail = permissionMenuMapper.selectOne(new LambdaQueryWrapper() + .ne(excludeId != null, PermissionMenuEntity::getId, excludeId) + .orderByDesc(PermissionMenuEntity::getSortOrder) + .orderByDesc(PermissionMenuEntity::getId) + .last("LIMIT 1")); + int currentMax = tail == null || tail.getSortOrder() == null ? 0 : tail.getSortOrder(); + return currentMax + 1; + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/controller/PriceTrackController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/controller/PriceTrackController.java index cf1b812..e0619cb 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/controller/PriceTrackController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/controller/PriceTrackController.java @@ -47,7 +47,8 @@ import java.util.List; @RequestMapping("/api/price-track") @Tag( name = "跟价", - description = "亚马逊跟价处理模块：包含备选店铺、紫鸟匹配、任务创建、Python 回传、任务轮询和结果下载接口。查询类接口需要携带 Query 参数 user_id。") + description = "亚马逊跟价处理模块，包含备选店铺、紫鸟匹配、任务创建、Python 回传、任务轮询和结果下载接口。查询类接口需携带 query 参数 user_id。" +) public class PriceTrackController { private final PriceTrackService priceTrackService; @@ -62,13 +63,13 @@ public class PriceTrackController { } @PostMapping("/candidates") - @Operation(summary = "新增备选店铺", description = "把店铺名称写入当前用户的备选店铺列表，供后续匹配和创建任务使用。") + @Operation(summary = "新增备选店铺", description = "新增一条备选店铺记录，供后续匹配和创建任务使用。") public ApiResponse addCandidate(@Valid @RequestBody PriceTrackCandidateAddRequest request) { return ApiResponse.success(priceTrackService.addCandidate(request)); } @DeleteMapping("/candidates/{id}") - @Operation(summary = "删除备选店铺", description = "删除一条备选店铺记录，id 必须属于当前 user_id。") + @Operation(summary = "删除备选店铺", description = "删除一条备选店铺记录，记录必须属于当前 user_id。") public ApiResponse deleteCandidate( @Parameter(description = "备选店铺记录主键", example = "10") @PathVariable Long id, @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @@ -107,7 +108,7 @@ public class PriceTrackController { } @GetMapping("/history") - @Operation(summary = "处理记录列表", description = "返回当前用户跟价模块下各店铺结果行，包含运行中和历史记录。") + @Operation(summary = "处理记录列表", description = "返回当前用户跟价模块下各店铺结果记录，包含运行中和历史记录。") public ApiResponse history( @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { @@ -115,7 +116,7 @@ public class PriceTrackController { } @DeleteMapping("/history/{resultId}") - @Operation(summary = "删除单条结果记录", description = "删除一条 biz_file_result，并同步重算父任务状态。") + @Operation(summary = "删除单条结果记录", description = "删除一条 biz_file_result 结果记录，并同步重算父任务状态。") public ApiResponse deleteHistory( @Parameter(description = "结果行主键 biz_file_result.id", example = "1001") @PathVariable Long resultId, @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @@ -131,7 +132,7 @@ public class PriceTrackController { } @DeleteMapping("/tasks/{taskId}") - @Operation(summary = "删除整条任务", description = "删除该任务以及其下属全部结果行，RUNNING、SUCCESS、FAILED 均可。") + @Operation(summary = "删除整条任务", description = "删除该任务以及其下全部结果行，RUNNING、SUCCESS、FAILED 均可删除。") public ApiResponse deleteTask( @Parameter(description = "任务主键 biz_file_task.id", example = "200") @PathVariable Long taskId, @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @@ -151,11 +152,17 @@ public class PriceTrackController { } @PostMapping("/tasks/batch") - @Operation(summary = "批量查询任务详情", description = "按 taskIds 返回任务概要和各店铺结果，供前端轮询使用。") + @Operation(summary = "批量查询任务详情", description = "按 taskIds 返回任务概要和各店铺结果，供前端查询使用。") public ApiResponse tasksBatch(@Valid @RequestBody PriceTrackTaskBatchRequest request) { return ApiResponse.success(priceTrackTaskService.getTaskDetailsBatch(request.getTaskIds())); } + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量查询任务进度摘要", description = "仅返回任务状态、时间和错误等轻量信息，供前端轮询降载。") + public ApiResponse taskProgressBatch(@Valid @RequestBody PriceTrackTaskBatchRequest request) { + return ApiResponse.success(priceTrackTaskService.getTaskProgressBatch(request.getTaskIds())); + } + @PostMapping("/tasks/{taskId}/result") @Operation(summary = "Python 回传处理结果", description = "同一 taskId 可多次回传。成功时按 countries 生成结果文件，所有店铺进入终态后任务会变为 SUCCESS 或 FAILED。") public ApiResponse submitResult( diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackMatchShopsRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackMatchShopsRequest.java index a743000..c405caf 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackMatchShopsRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackMatchShopsRequest.java @@ -8,13 +8,20 @@ import lombok.Data; import java.util.List; @Data -@Schema(description = "批量匹配店铺请求体：按店铺名查询紫鸟索引，返回是否命中及店铺元数据") +@Schema(description = "Price track match shops request") public class PriceTrackMatchShopsRequest { - @NotNull(message = "user_id不能为空") - @Schema(description = "当前用户 ID，用于审计和数据归属", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + + @NotNull(message = "userId is required") + @Schema(description = "Current user id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long userId; - @NotEmpty(message = "店铺列表不能为空") - @Schema(description = "待匹配的店铺名称列表，至少 1 个；返回体 items 与列表顺序对应", requiredMode = Schema.RequiredMode.REQUIRED, example = "[\"店铺甲\",\"店铺乙\"]") + @NotEmpty(message = "shopNames cannot be empty") + @Schema(description = "Shop names to match", requiredMode = Schema.RequiredMode.REQUIRED) private List shopNames; + + @Schema(description = "Selected ASIN file local paths") + private List asinFiles; + + @Schema(description = "Selected country codes") + private List countryCodes; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackSubmitResultRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackSubmitResultRequest.java index 5663628..37c5849 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackSubmitResultRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/dto/PriceTrackSubmitResultRequest.java @@ -7,43 +7,73 @@ import java.util.List; import java.util.Map; @Data -@Schema(description = "Python 回传跟价结果请求体：按店铺提交各国家 ASIN 跟价结果或错误信息") +@Schema(description = "Python submit payload for price track task results") public class PriceTrackSubmitResultRequest { - @Schema(description = "本次回传涉及的店铺列表，至少 1 个，店名需要能和任务结果行匹配", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "Shop result list", requiredMode = Schema.RequiredMode.REQUIRED) private List shops; @Data - @Schema(description = "单个店铺回传结果：成功时提供 countries，失败时可只提供 error") + @Schema(description = "Per-shop submit result") public static class ShopResult { - @Schema(description = "店铺名称，用于和任务内结果行匹配", example = "测试店铺A") + @Schema(description = "Shop name used to match task rows", example = "Test Shop A") private String shopName; - @Schema(description = "按国家分组的结果行，key 为国家代码，例如 DE、UK、FR、IT、ES") + @Schema(description = "Rows grouped by country code, for example DE/UK/FR/IT/ES") private Map> countries; - @Schema(description = "失败时的错误信息；非空则该店铺记为失败") + @Schema(description = "Failure message") private String error; - @Schema(description = "是否成功；false 按失败处理，true 或 null 通常表示结合 countries 判定") + @Schema(description = "Whether the shop finished successfully") private Boolean success; } @Data - @Schema(description = "单条 ASIN 跟价结果") + @Schema(description = "Per-ASIN price track result row") public static class AsinResult { + @Schema(description = "Shop mall name", example = "Amazon.de") + private String shopMallName; + @Schema(description = "ASIN", example = "B0ABCDE123") private String asin; - @Schema(description = "当前店铺价格", example = "19.99") + @Schema(description = "Price", example = "19.99") + private String price; + + @Schema(description = "Recommended price", example = "18.99") + private String recommendedPrice; + + @Schema(description = "Lowest price", example = "18.50") + private String minimumPrice; + + @Schema(description = "First place", example = "Competitor A") + private String firstPlace; + + @Schema(description = "Second place", example = "Competitor B") + private String secondPlace; + + @Schema(description = "Buy box shop name", example = "Shop A") + private String cartShopName; + + @Schema(description = "Price change status", example = "UPDATED") + private String priceChangeStatus; + + @Schema(description = "Modify count", example = "2") + private String modifyCount; + + @Schema(description = "Status", example = "SUCCESS") + private String status; + + @Schema(description = "Legacy current price", example = "19.99") private String currentPrice; - @Schema(description = "竞争对手价格", example = "18.50") + @Schema(description = "Legacy competitor price", example = "18.50") private String competitorPrice; - @Schema(description = "建议动作或跟价动作", example = "LOWER_PRICE") + @Schema(description = "Legacy action", example = "LOWER_PRICE") private String action; - @Schema(description = "该行是否已处理完成") + @Schema(description = "Legacy done flag") private Boolean done; } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackCreateTaskVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackCreateTaskVo.java index 7acb2a7..1e6b686 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackCreateTaskVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackCreateTaskVo.java @@ -4,13 +4,20 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; +import java.util.Map; @Data -@Schema(description = "创建任务响应：包含任务 id 和各店铺的初始结果快照") +@Schema(description = "price track create task response") public class PriceTrackCreateTaskVo { - @Schema(description = "新建任务主键 biz_file_task.id，前端推送队列时需要回传该值", example = "200") + @Schema(description = "task id", example = "200") private Long taskId; - @Schema(description = "各店铺一条初始结果快照，包含 resultId、taskId、店铺信息和初始任务状态") + @Schema(description = "initial task items") private List items; + + @Schema(description = "all skip asins grouped by country") + private Map> skipAsinsByCountry; + + @Schema(description = "parsed asin rows by country") + private Map>> asinRowsByCountry; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackMatchShopsVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackMatchShopsVo.java index e039a29..8e5a86c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackMatchShopsVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/model/vo/PriceTrackMatchShopsVo.java @@ -5,35 +5,47 @@ import lombok.Data; import java.util.ArrayList; import java.util.List; +import java.util.Map; @Data -@Schema(description = "批量匹配店铺响应") +@Schema(description = "Price track shop match response") public class PriceTrackMatchShopsVo { - @Schema(description = "逐店返回的匹配结果，顺序与请求 shopNames 对应") + + @Schema(description = "Match results in the same order as requested shop names") private List items = new ArrayList<>(); + @Schema(description = "All skip ASINs grouped by country code") + private Map> skipAsinsByCountry; + + @Schema(description = "Parsed asin rows grouped by country code") + private Map>> asinRowsByCountry; + @Data - @Schema(description = "单店匹配结果，同时也是创建任务时 items 的结构") + @Schema(description = "Single matched shop item") public static class PriceTrackShopQueueItem { - @Schema(description = "店铺名称", example = "某某店铺") + + @Schema(description = "Shop name", example = "Demo Shop") private String shopName; - @Schema(description = "紫鸟店铺 ID，未命中时可能为空") + @Schema(description = "Matched shop id") private Object shopId; - @Schema(description = "平台，例如亚马逊", example = "亚马逊") + @Schema(description = "Platform", example = "Amazon") private String platform; - @Schema(description = "公司名称或主体标识") + @Schema(description = "Company name") private String companyName; - @Schema(description = "是否命中紫鸟索引；false 时不可用于创建任务") + @Schema(description = "Whether the shop matched") private Boolean matched; - @Schema(description = "匹配状态码，例如 MATCHED、PENDING、CONFLICT、INDEX_STALE") + @Schema(description = "Match status, such as MATCHED or PENDING") private String matchStatus; - @Schema(description = "人类可读说明，供前端展示") + @Schema(description = "Readable match message") private String matchMessage; + + @Schema(description = "All skip ASINs grouped by country code") + private Map> skipAsins; } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java index 9fc5029..4b4d03f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackExcelAssemblyService.java @@ -19,7 +19,19 @@ import java.util.Map; @Slf4j public class PriceTrackExcelAssemblyService { - private static final String[] HEADER = {"ASIN", "当前店铺价格", "竞争对手价格", "建议动作", "是否完成"}; + private static final String[] RESULT_HEADER = { + "\u5e97\u94fa\u5546\u57ce\u540d\u79f0", + "ASIN", + "\u4ef7\u683c", + "\u63a8\u8350\u4ef7", + "\u6700\u4f4e\u4ef7", + "\u7b2c\u4e00\u540d", + "\u7b2c\u4e8c\u540d", + "\u8d2d\u7269\u8f66\u5e97\u94fa\u540d", + "\u6539\u4ef7\u60c5\u51b5", + "\u4fee\u6539\u6b21\u6570", + "\u72b6\u6001" + }; public void writeWorkbook(File outputXlsx, Map> countries) { Map> safe = countries == null ? Map.of() : countries; @@ -28,8 +40,8 @@ public class PriceTrackExcelAssemblyService { String sheetName = code.name(); Sheet sheet = wb.createSheet(sheetName); Row headerRow = sheet.createRow(0); - for (int i = 0; i < HEADER.length; i++) { - headerRow.createCell(i).setCellValue(HEADER[i]); + for (int i = 0; i < RESULT_HEADER.length; i++) { + headerRow.createCell(i).setCellValue(RESULT_HEADER[i]); } List rows = safe.getOrDefault(sheetName, List.of()); int rowIdx = 1; @@ -38,20 +50,26 @@ public class PriceTrackExcelAssemblyService { continue; } Row row = sheet.createRow(rowIdx++); - row.createCell(0).setCellValue(item.getAsin() == null ? "" : item.getAsin()); - row.createCell(1).setCellValue(item.getCurrentPrice() == null ? "" : item.getCurrentPrice()); - row.createCell(2).setCellValue(item.getCompetitorPrice() == null ? "" : item.getCompetitorPrice()); - row.createCell(3).setCellValue(item.getAction() == null ? "" : item.getAction()); - row.createCell(4).setCellValue(item.getDone() == null ? "" : String.valueOf(item.getDone())); + row.createCell(0).setCellValue(valueOf(item.getShopMallName())); + row.createCell(1).setCellValue(valueOf(item.getAsin())); + row.createCell(2).setCellValue(firstNonBlank(item.getPrice(), item.getCurrentPrice())); + row.createCell(3).setCellValue(valueOf(item.getRecommendedPrice())); + row.createCell(4).setCellValue(firstNonBlank(item.getMinimumPrice(), item.getCompetitorPrice())); + row.createCell(5).setCellValue(valueOf(item.getFirstPlace())); + row.createCell(6).setCellValue(valueOf(item.getSecondPlace())); + row.createCell(7).setCellValue(valueOf(item.getCartShopName())); + row.createCell(8).setCellValue(firstNonBlank(item.getPriceChangeStatus(), item.getAction())); + row.createCell(9).setCellValue(valueOf(item.getModifyCount())); + row.createCell(10).setCellValue(firstNonBlank(item.getStatus(), item.getDone() == null ? null : String.valueOf(item.getDone()))); } - for (int i = 0; i < HEADER.length; i++) { + for (int i = 0; i < RESULT_HEADER.length; i++) { sheet.autoSizeColumn(i); } } wb.write(fos); } catch (Exception ex) { log.warn("[price-track] write workbook failed: {}", ex.getMessage()); - throw new BusinessException("生成 Excel 失败: " + ex.getMessage()); + throw new BusinessException("鐢熸垚 Excel 澶辫触: " + ex.getMessage()); } } @@ -82,4 +100,20 @@ public class PriceTrackExcelAssemblyService { } return out; } + + private static String valueOf(String value) { + return value == null ? "" : value; + } + + private static String firstNonBlank(String... values) { + if (values == null || values.length == 0) { + return ""; + } + for (String value : values) { + if (value != null && !value.isBlank()) { + return value; + } + } + return ""; + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java index d9876b7..9f0f285 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackService.java @@ -24,8 +24,10 @@ 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 @@ -40,6 +42,7 @@ public class PriceTrackService { private final ObjectMapper objectMapper; private final ZiniaoShopSwitchService ziniaoShopSwitchService; private final SkipPriceAsinService skipPriceAsinService; + private final PriceTrackTaskService priceTrackTaskService; public List listCandidates(Long userId) { if (userId == null || userId <= 0) { @@ -139,9 +142,22 @@ public class PriceTrackService { throw new BusinessException("shop_names 没有有效店铺名"); } + boolean asinMode = request.getAsinFiles() != null && !request.getAsinFiles().isEmpty(); + Map> skipAsinsByCountry = asinMode + ? new LinkedHashMap<>() + : skipPriceAsinService.listAllSkipAsinsByCountry(); + Map>> asinRowsByCountry = + !asinMode + ? new LinkedHashMap<>() + : priceTrackTaskService.parseMatchAsinRowsByCountry( + request.getAsinFiles(), + request.getCountryCodes()); + PriceTrackMatchShopsVo vo = new PriceTrackMatchShopsVo(); + vo.setSkipAsinsByCountry(skipAsinsByCountry); + vo.setAsinRowsByCountry(asinRowsByCountry); for (String shopName : ordered) { - vo.getItems().add(matchOneShop(shopName)); + vo.getItems().add(matchOneShop(shopName, skipAsinsByCountry)); } return vo; } @@ -198,9 +214,13 @@ public class PriceTrackService { return vo; } - private PriceTrackMatchShopsVo.PriceTrackShopQueueItem matchOneShop(String shopName) { + private PriceTrackMatchShopsVo.PriceTrackShopQueueItem matchOneShop( + String shopName, + Map> skipAsins + ) { PriceTrackMatchShopsVo.PriceTrackShopQueueItem item = new PriceTrackMatchShopsVo.PriceTrackShopQueueItem(); item.setShopName(shopName); + item.setSkipAsins(skipAsins == null ? new LinkedHashMap<>() : new LinkedHashMap<>(skipAsins)); try { ZiniaoShopMatchResultVo match = ziniaoShopSwitchService.findIndexedStoreByName(shopName, false); if (match == null) { 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 da04c7e..649d53c 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 @@ -4,7 +4,9 @@ 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.common.util.ExcelStreamReader; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; +import com.nanri.aiimage.modules.productrisk.model.enums.ProductRiskCountryCode; import com.nanri.aiimage.modules.pricetrack.mapper.PriceTrackShopCandidateMapper; import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackCreateTaskRequest; import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackSubmitResultRequest; @@ -30,12 +32,19 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Locale; @Service @RequiredArgsConstructor @@ -179,8 +188,33 @@ public class PriceTrackTaskService { return batch; } + public PriceTrackTaskBatchVo getTaskProgressBatch(List taskIds) { + PriceTrackTaskBatchVo batch = new PriceTrackTaskBatchVo(); + if (taskIds == null || taskIds.isEmpty()) { + return batch; + } + for (Long taskId : taskIds) { + if (taskId == null || taskId <= 0) { + continue; + } + FileTaskEntity task = fileTaskMapper.selectById(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + batch.getMissingTaskIds().add(taskId); + continue; + } + PriceTrackTaskDetailVo detail = new PriceTrackTaskDetailVo(); + detail.setTask(toTaskItemVo(task)); + batch.getItems().add(detail); + } + return batch; + } + @Transactional public PriceTrackCreateTaskVo createTask(PriceTrackCreateTaskRequest request) { + if (request.isStatusMode() == request.isAsinMode()) throw new BusinessException("跟价模式必须二选一"); + if (request.isAsinMode() && (request.getAsinFiles() == null || request.getAsinFiles().isEmpty())) { + throw new BusinessException("自定义 ASIN 模式必须上传 ASIN 文件"); + } if (request.getUserId() == null || request.getUserId() <= 0) throw new BusinessException("user_id 不合法"); if (request.getItems() == null || request.getItems().isEmpty()) throw new BusinessException("items 不能为空"); @@ -195,13 +229,14 @@ public class PriceTrackTaskService { } // 汇总店铺名并查询需要跳过的 ASIN - List shopNames = uniqueItems.stream() - .map(PriceTrackMatchShopsVo.PriceTrackShopQueueItem::getShopName) - .filter(s -> s != null && !s.isBlank()) - .distinct() - .toList(); - Map> skipAsinsByShop = skipPriceAsinService.listSkipAsinsByShops(shopNames); - log.info("[price-track] createTask skipAsins shops={}", skipAsinsByShop.keySet()); + Map> skipAsinsByCountry = request.isAsinMode() + ? new LinkedHashMap<>() + : skipPriceAsinService.listAllSkipAsinsByCountry(); + Map>> asinRowsByCountry = request.isAsinMode() + ? parseAsinRowsByCountry(request.getAsinFiles(), request.getCountryCodes()) + : new LinkedHashMap<>(); + log.info("[price-track] createTask skipAsins countries={} asinMode={}", + skipAsinsByCountry.keySet(), request.isAsinMode()); // 创建任务记录 FileTaskEntity task = new FileTaskEntity(); @@ -242,7 +277,8 @@ public class PriceTrackTaskService { ctx.put("statusMode", request.isStatusMode()); ctx.put("asinMode", request.isAsinMode()); ctx.put("countryCodes", request.getCountryCodes()); - ctx.put("skipAsinsByShop", skipAsinsByShop); + ctx.put("skipAsinsByCountry", skipAsinsByCountry); + ctx.put("asinRowsByCountry", asinRowsByCountry); ctx.put("items", uniqueItems); task.setRequestJson(objectMapper.writeValueAsString(ctx)); task.setResultJson(objectMapper.writeValueAsString(snapshot)); @@ -257,6 +293,8 @@ public class PriceTrackTaskService { PriceTrackCreateTaskVo vo = new PriceTrackCreateTaskVo(); vo.setTaskId(task.getId()); vo.setItems(snapshot); + vo.setSkipAsinsByCountry(skipAsinsByCountry); + vo.setAsinRowsByCountry(asinRowsByCountry); return vo; } @@ -272,7 +310,7 @@ public class PriceTrackTaskService { } if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { log.warn("[price-track] submitResult rejected taskId={} status={}", taskId, task.getStatus()); - throw new BusinessException("任务已结束，拒绝重复提交"); + throw new BusinessException(40901, "任务已结束，拒绝重复提交"); } priceTrackTaskCacheService.touchTaskHeartbeat(taskId); @@ -452,6 +490,211 @@ public class PriceTrackTaskService { } } + public Map>> parseMatchAsinRowsByCountry(List asinFiles, List countryCodes) { + return parseAsinRowsByCountry(asinFiles, countryCodes); + } + + private Map>> parseAsinRowsByCountry(List asinFiles, List countryCodes) { + Map>> merged = new LinkedHashMap<>(); + if (asinFiles == null || asinFiles.isEmpty()) { + return merged; + } + for (String rawPath : asinFiles) { + if (rawPath == null || rawPath.isBlank()) { + continue; + } + File file = new File(rawPath); + if (!file.isFile()) { + throw new BusinessException("ASIN file not found: " + rawPath); + } + String lowerName = file.getName().toLowerCase(Locale.ROOT); + if (lowerName.endsWith(".csv")) { + mergeCountryRows(merged, parseCsvAsinRows(file, countryCodes)); + continue; + } + if (lowerName.endsWith(".xlsx") || lowerName.endsWith(".xls")) { + mergeCountryRows(merged, parseWorkbookAsinRows(file, countryCodes)); + continue; + } + throw new BusinessException("Unsupported ASIN file type: " + file.getName()); + } + return merged; + } + + private Map>> parseWorkbookAsinRows(File file, List countryCodes) { + Map>> out = new LinkedHashMap<>(); + Map[] headerIndexHolder = new Map[]{Map.of()}; + String[] countryCodeHolder = new String[]{null}; + int[] sheetCount = new int[]{0}; + try { + ExcelStreamReader.readAllSheets(file, new ExcelStreamReader.SheetRowHandler() { + @Override + public void onHeader(String sheetName, Integer sheetNo, Map headerMap) { + sheetCount[0]++; + countryCodeHolder[0] = resolveCountryCode(sheetName, countryCodes, false); + headerIndexHolder[0] = buildHeaderIndex(headerMap); + } + + @Override + public void onRow(String sheetName, Integer sheetNo, int rowIndex, Map headerMap, Map rowMap) { + String countryCode = countryCodeHolder[0]; + if (countryCode == null && sheetCount[0] == 1 && countryCodes != null && countryCodes.size() == 1) { + countryCode = countryCodes.get(0); + } + if (countryCode == null) { + return; + } + if (headerIndexHolder[0].isEmpty()) { + return; + } + Map item = extractAsinRow(rowMap, headerIndexHolder[0]); + if (!item.isEmpty()) { + out.computeIfAbsent(countryCode, key -> new ArrayList<>()).add(item); + } + } + }); + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("Failed to parse ASIN workbook"); + } + return out; + } + + private Map>> parseCsvAsinRows(File file, List countryCodes) { + if (countryCodes == null || countryCodes.size() != 1) { + throw new BusinessException("CSV ASIN file requires exactly one selected country"); + } + Map>> out = new LinkedHashMap<>(); + List> rows = out.computeIfAbsent(countryCodes.get(0), key -> new ArrayList<>()); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) { + String headerLine = reader.readLine(); + if (headerLine == null) { + return out; + } + List headers = splitCsvLine(headerLine); + Map headerIndex = buildHeaderIndex(headers); + String line; + while ((line = reader.readLine()) != null) { + List values = splitCsvLine(line); + Map item = extractAsinRow(values, headerIndex); + if (!item.isEmpty()) { + rows.add(item); + } + } + } catch (BusinessException ex) { + throw ex; + } catch (Exception ex) { + throw new BusinessException("Failed to parse ASIN csv"); + } + return out; + } + + private void mergeCountryRows(Map>> target, Map>> incoming) { + for (Map.Entry>> entry : incoming.entrySet()) { + target.computeIfAbsent(entry.getKey(), key -> new ArrayList<>()).addAll(entry.getValue()); + } + } + + private String resolveCountryCode(String sheetName, List countryCodes, boolean singleSheetFallback) { + String normalized = normalizeHeaderText(sheetName).toUpperCase(Locale.ROOT); + for (ProductRiskCountryCode code : ProductRiskCountryCode.values()) { + if (code.name().equals(normalized) || normalizeHeaderText(code.getSheetName()).equals(normalizeHeaderText(sheetName))) { + return code.name(); + } + } + if (singleSheetFallback && countryCodes != null && countryCodes.size() == 1) { + return countryCodes.get(0); + } + return null; + } + + private Map buildHeaderIndex(Map headerRow) { + List headers = new ArrayList<>(); + int maxIndex = headerRow.keySet().stream().mapToInt(Integer::intValue).max().orElse(-1); + for (int i = 0; i <= maxIndex; i++) { + headers.add(normalizeCellText(headerRow.get(i))); + } + return buildHeaderIndex(headers); + } + + private Map buildHeaderIndex(List headers) { + Map index = new LinkedHashMap<>(); + for (int i = 0; i < headers.size(); i++) { + String key = mapHeaderKey(headers.get(i)); + if (key != null && !index.containsKey(key)) { + index.put(key, i); + } + } + return index; + } + + private Map extractAsinRow(Map row, Map headerIndex) { + Map item = new LinkedHashMap<>(); + for (Map.Entry entry : headerIndex.entrySet()) { + item.put(entry.getKey(), normalizeCellText(row.get(entry.getValue()))); + } + return isEmptyAsinRow(item) ? Map.of() : item; + } + + private Map extractAsinRow(List values, Map headerIndex) { + Map item = new LinkedHashMap<>(); + for (Map.Entry entry : headerIndex.entrySet()) { + int idx = entry.getValue(); + item.put(entry.getKey(), idx >= 0 && idx < values.size() ? normalizeCellText(values.get(idx)) : ""); + } + return isEmptyAsinRow(item) ? Map.of() : item; + } + + private boolean isEmptyAsinRow(Map row) { + return row.values().stream().allMatch(value -> value == null || value.isBlank()); + } + + private String mapHeaderKey(String rawHeader) { + String header = normalizeHeaderText(rawHeader); + if (header.isEmpty()) { + return null; + } + return switch (header) { + case "店铺商城名称", "shopmallname" -> "shopMallName"; + case "asin" -> "asin"; + case "价格", "price" -> "price"; + case "推荐价", "recommendedprice" -> "recommendedPrice"; + case "最低价", "minimumprice" -> "minimumPrice"; + case "第一名", "firstplace" -> "firstPlace"; + case "第二名", "secondplace" -> "secondPlace"; + case "购物车店铺名", "cartshopname" -> "cartShopName"; + case "改价情况", "pricechangestatus" -> "priceChangeStatus"; + case "修改次数", "modifycount" -> "modifyCount"; + case "状态", "status" -> "status"; + default -> null; + }; + } + + private String normalizeCellText(String value) { + if (value == null) { + return ""; + } + return value.replace("\ufeff", "") + .replace("\u3000", " ") + .replace("\r", " ") + .replace("\n", " ") + .trim() + .replaceAll("\\s+", " "); + } + + private String normalizeHeaderText(String value) { + return normalizeCellText(value) + .replaceAll("\\s+", "") + .toLowerCase(Locale.ROOT); + } + + private List splitCsvLine(String line) { + return Arrays.stream((line == null ? "" : line).split(",", -1)) + .map(String::trim) + .toList(); + } + private List dedupeQueueItems(List raw) { Map byNorm = new LinkedHashMap<>(); for (PriceTrackMatchShopsVo.PriceTrackShopQueueItem item : raw) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/controller/ProductRiskResolveController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/controller/ProductRiskResolveController.java index e401ccb..dad10af 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/controller/ProductRiskResolveController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/controller/ProductRiskResolveController.java @@ -159,6 +159,12 @@ public class ProductRiskResolveController { return ApiResponse.success(productRiskTaskService.getTaskDetailsBatch(request.getTaskIds())); } + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量查询任务进度摘要", description = "仅返回任务状态、时间和错误等轻量信息，供前端轮询降载。") + public ApiResponse taskProgressBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) { + return ApiResponse.success(productRiskTaskService.getTaskProgressBatch(request.getTaskIds())); + } + @PostMapping("/tasks/{taskId}/result") @Operation( summary = "Python 回传处理结果", diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java index f841151..837fd9f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/productrisk/service/ProductRiskTaskService.java @@ -147,6 +147,7 @@ public class ProductRiskTaskService { .eq(FileResultEntity::getTaskId, taskId) .eq(FileResultEntity::getModuleType, MODULE_TYPE)); fileTaskMapper.deleteById(taskId); + cleanupTaskCacheIfTerminal(taskId, "DELETE_EMPTY"); } /** @@ -283,6 +284,27 @@ public class ProductRiskTaskService { return batch; } + public ProductRiskTaskBatchVo getTaskProgressBatch(List taskIds) { + ProductRiskTaskBatchVo batch = new ProductRiskTaskBatchVo(); + if (taskIds == null || taskIds.isEmpty()) { + return batch; + } + for (Long taskId : taskIds) { + if (taskId == null || taskId <= 0) { + continue; + } + FileTaskEntity task = fileTaskMapper.selectById(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + batch.getMissingTaskIds().add(taskId); + continue; + } + ProductRiskTaskDetailVo detail = new ProductRiskTaskDetailVo(); + detail.setTask(toTaskItemVo(task)); + batch.getItems().add(detail); + } + 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())) { @@ -390,7 +412,7 @@ public class ProductRiskTaskService { if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { log.warn("[product-risk] submitResult rejected taskId={} status={} payloadShopCount={}", taskId, task.getStatus(), request.getShops() == null ? 0 : request.getShops().size()); - throw new BusinessException("任务已结束，拒绝重复提交"); + throw new BusinessException(40901, "任务已结束，拒绝重复提交"); } String oldStatus = task.getStatus(); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/ShopManageController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/ShopManageController.java index 4d50b06..1efa657 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/ShopManageController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/ShopManageController.java @@ -44,7 +44,7 @@ public class ShopManageController { private final ShopManageGroupService shopManageGroupService; @GetMapping - @Operation(summary = "分页查询店铺", description = "支持按分组、店铺名称、创建人进行筛选") + @Operation(summary = "分页查询店铺", description = "支持按分组、店铺名、当前操作者可见范围筛选") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse( responseCode = "200", @@ -56,14 +56,21 @@ public class ShopManageController { @Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize, @Parameter(description = "分组 ID") @RequestParam(required = false) Long groupId, @Parameter(description = "店铺名称") @RequestParam(required = false) String shopName, - @Parameter(description = "创建人用户 ID，普通管理员只传自己") @RequestParam(required = false) Long createdById) { - return ApiResponse.success(shopManageService.page(page, pageSize, groupId, shopName, createdById)); + @Parameter(description = "当前操作人用户ID") @RequestParam(required = false) Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + return ApiResponse.success(shopManageService.page( + page, + pageSize, + groupId, + shopName, + operatorId, + Boolean.TRUE.equals(superAdmin))); } @PostMapping @Operation(summary = "新增店铺", description = "创建店铺记录，并写入创建人") public ApiResponse create( - @Parameter(description = "当前操作人用户 ID") @RequestParam Long operatorId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, @Valid @RequestBody ShopManageCreateRequest request) { return ApiResponse.success("创建成功", @@ -71,10 +78,10 @@ public class ShopManageController { } @PutMapping("/{id}") - @Operation(summary = "更新店铺", description = "按 ID 更新店铺，普通管理员只能修改自己创建的数据") + @Operation(summary = "更新店铺", description = "按 ID 更新店铺") public ApiResponse update( @Parameter(description = "主键 ID", required = true) @PathVariable Long id, - @Parameter(description = "当前操作人用户 ID") @RequestParam Long operatorId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, @Valid @RequestBody ShopManageUpdateRequest request) { return ApiResponse.success("更新成功", @@ -82,33 +89,42 @@ public class ShopManageController { } @DeleteMapping("/{id}") - @Operation(summary = "删除店铺", description = "按 ID 删除店铺，普通管理员只能删除自己创建的数据") + @Operation(summary = "删除店铺", description = "按 ID 删除店铺") public ApiResponse delete( @Parameter(description = "主键 ID", required = true) @PathVariable Long id, - @Parameter(description = "当前操作人用户 ID") @RequestParam Long operatorId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { shopManageService.delete(id, operatorId, Boolean.TRUE.equals(superAdmin)); return ApiResponse.success("删除成功", null); } @GetMapping("/groups") - @Operation(summary = "查询分组列表", description = "普通管理员只返回自己创建的分组，超级管理员返回全部") + @Operation(summary = "查询分组列表", description = "普通管理员返回当前可访问的分组，超级管理员返回全部") public ApiResponse> listGroups( - @Parameter(description = "创建人用户 ID，普通管理员只传自己") @RequestParam(required = false) Long createdById) { - return ApiResponse.success(shopManageGroupService.list(createdById)); + @Parameter(description = "创建人用户ID") @RequestParam(required = false) Long createdById, + @Parameter(description = "当前操作人用户ID") @RequestParam(required = false) Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + if (Boolean.TRUE.equals(superAdmin)) { + return ApiResponse.success(shopManageGroupService.list(createdById)); + } + return ApiResponse.success(shopManageGroupService.listAccessible(operatorId, false)); } @PostMapping("/groups") @Operation(summary = "新增分组", description = "创建分组并写入创建人") - public ApiResponse createGroup(@Valid @RequestBody ShopManageGroupCreateRequest request) { - return ApiResponse.success("创建成功", shopManageGroupService.create(request)); + public ApiResponse createGroup( + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, + @Valid @RequestBody ShopManageGroupCreateRequest request) { + return ApiResponse.success("创建成功", + shopManageGroupService.create(request, operatorId, Boolean.TRUE.equals(superAdmin))); } @PutMapping("/groups/{id}") - @Operation(summary = "更新分组", description = "普通管理员只能修改自己创建的分组") + @Operation(summary = "更新分组", description = "普通管理员只能修改自己可访问的分组") public ApiResponse updateGroup( @Parameter(description = "主键 ID", required = true) @PathVariable Long id, - @Parameter(description = "当前操作人用户 ID") @RequestParam Long operatorId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, @Valid @RequestBody ShopManageGroupUpdateRequest request) { return ApiResponse.success("更新成功", @@ -116,10 +132,10 @@ public class ShopManageController { } @DeleteMapping("/groups/{id}") - @Operation(summary = "删除分组", description = "普通管理员只能删除自己创建的分组") + @Operation(summary = "删除分组", description = "普通管理员只能删除自己可访问的分组") public ApiResponse deleteGroup( @Parameter(description = "主键 ID", required = true) @PathVariable Long id, - @Parameter(description = "当前操作人用户 ID") @RequestParam Long operatorId, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { shopManageGroupService.delete(id, operatorId, Boolean.TRUE.equals(superAdmin)); return ApiResponse.success("删除成功", null); 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 index d840a87..74c951b 100644 --- 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 @@ -1,8 +1,8 @@ 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.dto.SkipPriceAsinCountryUpdateRequest; +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; @@ -36,14 +36,27 @@ public class SkipPriceAsinController { @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)); + @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(skipPriceAsinService.page( + page, + pageSize, + groupId, + shopName, + asin, + operatorId, + Boolean.TRUE.equals(superAdmin))); } @PostMapping @Operation(summary = "新增或覆盖跳过跟价 ASIN") - public ApiResponse create(@Valid @RequestBody SkipPriceAsinCreateRequest request) { - return ApiResponse.success("保存成功", skipPriceAsinService.createOrUpdate(request)); + public ApiResponse create( + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin, + @Valid @RequestBody SkipPriceAsinCreateRequest request) { + return ApiResponse.success("保存成功", + skipPriceAsinService.createOrUpdate(request, operatorId, Boolean.TRUE.equals(superAdmin))); } @PutMapping("/{id}/countries/{country}") @@ -51,16 +64,25 @@ public class SkipPriceAsinController { 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 SkipPriceAsinCountryUpdateRequest request) { - return ApiResponse.success("保存成功", skipPriceAsinService.updateCountry(id, country, request.getAsin())); + return ApiResponse.success("保存成功", skipPriceAsinService.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) { - skipPriceAsinService.deleteCountry(id, country); + @Parameter(description = "国家编码", required = true) @PathVariable String country, + @Parameter(description = "当前操作人用户ID") @RequestParam Long operatorId, + @Parameter(description = "是否超级管理员") @RequestParam(defaultValue = "false") Boolean superAdmin) { + skipPriceAsinService.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/model/dto/ShopManageGroupCreateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupCreateRequest.java index 62d2d5b..236cba7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupCreateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupCreateRequest.java @@ -12,7 +12,11 @@ public class ShopManageGroupCreateRequest { @NotBlank(message = "分组名称不能为空") private String groupName; - @Schema(description = "创建人用户 ID，由后台代理透传", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "关联用户ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "关联用户不能为空") + private Long userId; + + @Schema(description = "创建人用户ID，由后台代理透传", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "创建人不能为空") private Long createdById; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupUpdateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupUpdateRequest.java index 1469aca..cfa0f92 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupUpdateRequest.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/dto/ShopManageGroupUpdateRequest.java @@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.shopkey.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data @@ -10,4 +11,8 @@ public class ShopManageGroupUpdateRequest { @Schema(description = "分组名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "分组名称不能为空") private String groupName; + + @Schema(description = "关联用户ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "关联用户不能为空") + private Long userId; } 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 index 537d03e..22d666d 100644 --- 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 @@ -6,6 +6,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; +import java.util.Map; @Data public class SkipPriceAsinCreateRequest { @@ -19,6 +20,13 @@ public class SkipPriceAsinCreateRequest { @NotEmpty(message = "请至少选择一个国家") private List countries; - @NotBlank(message = "ASIN 不能为空") + /** + * 兼容旧请求: 选中的国家共用同一个 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/ShopManageGroupEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageGroupEntity.java index 623de76..33e4dee 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageGroupEntity.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/entity/ShopManageGroupEntity.java @@ -15,6 +15,8 @@ public class ShopManageGroupEntity { @TableId(type = IdType.AUTO) private Long id; private String groupName; + @TableField("user_id") + private Long userId; @TableField("created_by_id") private Long createdById; private LocalDateTime createdAt; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageGroupItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageGroupItemVo.java index a3da49e..3f6de7f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageGroupItemVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/model/vo/ShopManageGroupItemVo.java @@ -8,6 +8,8 @@ import java.time.LocalDateTime; public class ShopManageGroupItemVo { private Long id; private String groupName; + private Long userId; + private String username; private LocalDateTime createdAt; private LocalDateTime updatedAt; } 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 95d2314..b18f70d 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 @@ -2,6 +2,8 @@ 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.permission.mapper.AdminUserMapper; +import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity; import com.nanri.aiimage.modules.shopkey.mapper.ShopManageGroupMapper; import com.nanri.aiimage.modules.shopkey.mapper.ShopManageMapper; import com.nanri.aiimage.modules.shopkey.model.dto.ShopManageGroupCreateRequest; @@ -13,7 +15,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; @Service @RequiredArgsConstructor @@ -21,6 +25,7 @@ public class ShopManageGroupService { private final ShopManageGroupMapper groupMapper; private final ShopManageMapper shopManageMapper; + private final AdminUserMapper adminUserMapper; public List list() { return list(null); @@ -35,13 +40,56 @@ public class ShopManageGroupService { .toList(); } + public List listAccessible(Long operatorId, boolean superAdmin) { + if (superAdmin) { + return list(); + } + Long normalizedOperatorId = normalizePositiveId(operatorId, "操作人不能为空"); + return groupMapper.selectList(new LambdaQueryWrapper() + .and(wrapper -> wrapper + .eq(ShopManageGroupEntity::getCreatedById, normalizedOperatorId) + .or() + .eq(ShopManageGroupEntity::getUserId, normalizedOperatorId)) + .orderByAsc(ShopManageGroupEntity::getId)) + .stream() + .map(this::toVo) + .toList(); + } + + public Set listAccessibleGroupIds(Long operatorId, boolean superAdmin) { + if (superAdmin) { + return groupMapper.selectList(new LambdaQueryWrapper() + .select(ShopManageGroupEntity::getId)) + .stream() + .map(ShopManageGroupEntity::getId) + .filter(id -> id != null && id > 0) + .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); + } + Long normalizedOperatorId = normalizePositiveId(operatorId, "操作人不能为空"); + return groupMapper.selectList(new LambdaQueryWrapper() + .select(ShopManageGroupEntity::getId) + .and(wrapper -> wrapper + .eq(ShopManageGroupEntity::getCreatedById, normalizedOperatorId) + .or() + .eq(ShopManageGroupEntity::getUserId, normalizedOperatorId))) + .stream() + .map(ShopManageGroupEntity::getId) + .filter(id -> id != null && id > 0) + .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); + } + @Transactional - public ShopManageGroupItemVo create(ShopManageGroupCreateRequest request) { + public ShopManageGroupItemVo create(ShopManageGroupCreateRequest request, Long operatorId, boolean superAdmin) { Long createdById = normalizePositiveId(request.getCreatedById(), "创建人不能为空"); + AdminUserEntity bindUser = getBindableUser(request.getUserId(), operatorId, superAdmin); String groupName = normalizeRequired(request.getGroupName(), "分组名称不能为空"); - ensureGroupNameUnique(groupName, null, createdById, false); + ensureGroupNameMatchesUser(groupName, bindUser); + ensureGroupNameUnique(groupName, null); + ensureUserUnique(request.getUserId(), null); + ShopManageGroupEntity entity = new ShopManageGroupEntity(); entity.setGroupName(groupName); + entity.setUserId(bindUser.getId()); entity.setCreatedById(createdById); groupMapper.insert(entity); return toVo(getById(entity.getId())); @@ -51,9 +99,14 @@ public class ShopManageGroupService { public ShopManageGroupItemVo update(Long id, Long operatorId, boolean superAdmin, ShopManageGroupUpdateRequest request) { ShopManageGroupEntity entity = getById(id); validateOwnership(entity, operatorId, superAdmin); + AdminUserEntity bindUser = getBindableUser(request.getUserId(), operatorId, superAdmin); String groupName = normalizeRequired(request.getGroupName(), "分组名称不能为空"); - ensureGroupNameUnique(groupName, id, operatorId, superAdmin); + ensureGroupNameMatchesUser(groupName, bindUser); + ensureGroupNameUnique(groupName, id); + ensureUserUnique(bindUser.getId(), id); + entity.setGroupName(groupName); + entity.setUserId(bindUser.getId()); groupMapper.updateById(entity); return toVo(getById(id)); } @@ -84,12 +137,9 @@ public class ShopManageGroupService { return entity; } - private void ensureGroupNameUnique(String groupName, Long excludeId, Long operatorId, boolean superAdmin) { + private void ensureGroupNameUnique(String groupName, Long excludeId) { LambdaQueryWrapper query = new LambdaQueryWrapper() .eq(ShopManageGroupEntity::getGroupName, groupName); - if (!superAdmin) { - query.eq(ShopManageGroupEntity::getCreatedById, normalizePositiveId(operatorId, "操作人不能为空")); - } if (excludeId != null) { query.ne(ShopManageGroupEntity::getId, excludeId); } @@ -99,16 +149,54 @@ public class ShopManageGroupService { } } + private void ensureUserUnique(Long userId, Long excludeId) { + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(ShopManageGroupEntity::getUserId, userId); + if (excludeId != null) { + query.ne(ShopManageGroupEntity::getId, excludeId); + } + Long count = groupMapper.selectCount(query); + if (count != null && count > 0) { + throw new BusinessException("该用户已绑定分组"); + } + } + + private void ensureGroupNameMatchesUser(String groupName, AdminUserEntity bindUser) { + if (bindUser == null || bindUser.getUsername() == null || !groupName.equals(bindUser.getUsername().trim())) { + throw new BusinessException("分组名称必须与关联用户名一致"); + } + } + private void validateOwnership(ShopManageGroupEntity entity, Long operatorId, boolean superAdmin) { if (superAdmin) { return; } Long normalizedOperatorId = normalizePositiveId(operatorId, "操作人不能为空"); - if (entity.getCreatedById() == null || !entity.getCreatedById().equals(normalizedOperatorId)) { - throw new BusinessException("只能操作自己创建的分组数据"); + boolean createdBySelf = entity.getCreatedById() != null && entity.getCreatedById().equals(normalizedOperatorId); + boolean boundToSelf = entity.getUserId() != null && entity.getUserId().equals(normalizedOperatorId); + if (!createdBySelf && !boundToSelf) { + throw new BusinessException("只能操作自己有权限的分组数据"); } } + private AdminUserEntity getBindableUser(Long userId, Long operatorId, boolean superAdmin) { + Long normalizedUserId = normalizePositiveId(userId, "关联用户不能为空"); + AdminUserEntity user = adminUserMapper.selectById(normalizedUserId); + if (user == null) { + throw new BusinessException("关联用户不存在"); + } + if (superAdmin) { + return user; + } + Long normalizedOperatorId = normalizePositiveId(operatorId, "操作人不能为空"); + boolean self = user.getId() != null && user.getId().equals(normalizedOperatorId); + boolean createdBySelf = user.getCreatedById() != null && user.getCreatedById().equals(normalizedOperatorId); + if (!self && !createdBySelf) { + throw new BusinessException("只能关联自己可见的用户"); + } + return user; + } + private String normalizeRequired(String value, String message) { String normalized = value == null ? "" : value.trim(); if (normalized.isEmpty()) { @@ -128,6 +216,9 @@ public class ShopManageGroupService { ShopManageGroupItemVo vo = new ShopManageGroupItemVo(); vo.setId(entity.getId()); vo.setGroupName(entity.getGroupName()); + vo.setUserId(entity.getUserId()); + AdminUserEntity bindUser = entity.getUserId() == null ? null : adminUserMapper.selectById(entity.getUserId()); + vo.setUsername(bindUser == null ? "" : (bindUser.getUsername() == null ? "" : bindUser.getUsername())); vo.setCreatedAt(entity.getCreatedAt()); vo.setUpdatedAt(entity.getUpdatedAt()); return vo; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java index f6ab333..4f72fb6 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/service/ShopManageService.java @@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; @Service @RequiredArgsConstructor @@ -27,24 +28,27 @@ public class ShopManageService { private final ShopManageGroupService shopManageGroupService; private final ShopCredentialCryptoService shopCredentialCryptoService; - public ShopManagePageVo page(long page, long pageSize) { - return page(page, pageSize, null, null, null); - } - - public ShopManagePageVo page(long page, long pageSize, Long groupId, String shopName) { - return page(page, pageSize, groupId, shopName, null); - } - - public ShopManagePageVo page(long page, long pageSize, Long groupId, String shopName, Long createdById) { + public ShopManagePageVo page(long page, long pageSize, Long groupId, String shopName, Long operatorId, boolean superAdmin) { long safePage = Math.max(page, 1); long safePageSize = Math.min(Math.max(pageSize, 1), 100); String safeShopName = shopName == null ? "" : shopName.trim(); + Set accessibleGroupIds = superAdmin ? Set.of() : shopManageGroupService.listAccessibleGroupIds(operatorId, false); LambdaQueryWrapper query = new LambdaQueryWrapper() .eq(groupId != null && groupId > 0, ShopManageEntity::getGroupId, groupId) - .eq(createdById != null && createdById > 0, ShopManageEntity::getCreatedById, createdById) .like(!safeShopName.isEmpty(), ShopManageEntity::getShopName, safeShopName) .orderByDesc(ShopManageEntity::getId); + + if (!superAdmin) { + Long normalizedOperatorId = normalizePositiveId(operatorId, "操作人不能为空"); + query.and(wrapper -> { + wrapper.eq(ShopManageEntity::getCreatedById, normalizedOperatorId); + if (!accessibleGroupIds.isEmpty()) { + wrapper.or().in(ShopManageEntity::getGroupId, accessibleGroupIds); + } + }); + } + Long total = shopManageMapper.selectCount(query); List rows = shopManageMapper .selectList(query.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize)); @@ -90,7 +94,7 @@ public class ShopManageService { @Transactional public ShopManageItemVo update(Long id, Long operatorId, boolean superAdmin, ShopManageUpdateRequest request) { ShopManageEntity entity = getById(id); - validateOwnership(entity, operatorId, superAdmin); + validateGroupAccess(entity, operatorId, superAdmin); ShopManageGroupEntity group = shopManageGroupService.getAccessibleById(request.getGroupId(), operatorId, superAdmin); String shopName = normalizeRequired(request.getShopName(), "店铺名称不能为空"); String mallName = normalizeRequired(request.getMallName(), "商城名称不能为空"); @@ -110,7 +114,7 @@ public class ShopManageService { @Transactional public void delete(Long id, Long operatorId, boolean superAdmin) { ShopManageEntity entity = getById(id); - validateOwnership(entity, operatorId, superAdmin); + validateGroupAccess(entity, operatorId, superAdmin); shopManageMapper.deleteById(entity.getId()); } @@ -146,14 +150,8 @@ public class ShopManageService { return entity; } - private void validateOwnership(ShopManageEntity entity, Long operatorId, boolean superAdmin) { - if (superAdmin) { - return; - } - Long normalizedOperatorId = normalizePositiveId(operatorId, "操作人不能为空"); - if (entity.getCreatedById() == null || !entity.getCreatedById().equals(normalizedOperatorId)) { - throw new BusinessException("只能操作自己创建的店铺数据"); - } + private void validateGroupAccess(ShopManageEntity entity, Long operatorId, boolean superAdmin) { + shopManageGroupService.getAccessibleById(entity.getGroupId(), operatorId, superAdmin); } private String normalizeRequired(String value, String message) { @@ -208,7 +206,6 @@ public class ShopManageService { vo.setMallName(entity.getMallName()); vo.setAccount(entity.getAccount()); String masked = entity.getPassword() == null || entity.getPassword().isBlank() ? "" : "******"; - // 兼容旧前端字段：password 继续返回脱敏值 vo.setPassword(masked); vo.setPasswordMasked(masked); vo.setCreatedAt(entity.getCreatedAt()); 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 index 8a95f2d..0407766 100644 --- 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 @@ -28,11 +28,13 @@ public class SkipPriceAsinService { private final SkipPriceAsinMapper skipPriceAsinMapper; private final ShopManageGroupService shopManageGroupService; - public SkipPriceAsinPageVo page(long page, long pageSize, Long groupId, String shopName, String asin) { + public SkipPriceAsinPageVo 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, SkipPriceAsinEntity::getGroupId, groupId) @@ -45,6 +47,14 @@ public class SkipPriceAsinService { .or().like(SkipPriceAsinEntity::getAsinEs, safeAsin)) .orderByDesc(SkipPriceAsinEntity::getId); + if (!superAdmin) { + if (accessibleGroupIds.isEmpty()) { + query.eq(SkipPriceAsinEntity::getId, -1L); + } else { + query.in(SkipPriceAsinEntity::getGroupId, accessibleGroupIds); + } + } + Long total = skipPriceAsinMapper.selectCount(query); List rows = skipPriceAsinMapper .selectList(query.last("LIMIT " + ((safePage - 1) * safePageSize) + ", " + safePageSize)); @@ -64,11 +74,11 @@ public class SkipPriceAsinService { } @Transactional - public SkipPriceAsinItemVo createOrUpdate(SkipPriceAsinCreateRequest request) { - ShopManageGroupEntity group = shopManageGroupService.getById(request.getGroupId()); + public SkipPriceAsinItemVo createOrUpdate(SkipPriceAsinCreateRequest request, Long operatorId, boolean superAdmin) { + ShopManageGroupEntity group = shopManageGroupService.getAccessibleById(request.getGroupId(), operatorId, superAdmin); String shopName = normalizeRequired(request.getShopName(), "店铺名不能为空"); - String asin = normalizeAsin(request.getAsin()); Set countries = normalizeCountries(request.getCountries()); + Map countryAsinMap = normalizeCountryAsinMap(countries, request); SkipPriceAsinEntity entity = skipPriceAsinMapper.selectOne(new LambdaQueryWrapper() .eq(SkipPriceAsinEntity::getGroupId, group.getId()) @@ -80,8 +90,8 @@ public class SkipPriceAsinService { entity.setShopName(shopName); } - for (String country : countries) { - setCountryAsin(entity, country, asin); + for (Map.Entry entry : countryAsinMap.entrySet()) { + setCountryAsin(entity, entry.getKey(), entry.getValue()); } if (entity.getId() == null) { @@ -94,8 +104,9 @@ public class SkipPriceAsinService { } @Transactional - public void deleteCountry(Long id, String country) { + public void deleteCountry(Long id, String country, Long operatorId, boolean superAdmin) { SkipPriceAsinEntity entity = getById(id); + validateGroupAccess(entity, operatorId, superAdmin); String normalizedCountry = normalizeCountry(country); setCountryAsin(entity, normalizedCountry, ""); if (isEmptyRow(entity)) { @@ -106,8 +117,9 @@ public class SkipPriceAsinService { } @Transactional - public SkipPriceAsinItemVo updateCountry(Long id, String country, String asin) { + public SkipPriceAsinItemVo updateCountry(Long id, String country, String asin, Long operatorId, boolean superAdmin) { SkipPriceAsinEntity entity = getById(id); + validateGroupAccess(entity, operatorId, superAdmin); String normalizedCountry = normalizeCountry(country); String normalizedAsin = normalizeAsin(asin); setCountryAsin(entity, normalizedCountry, normalizedAsin); @@ -131,6 +143,10 @@ public class SkipPriceAsinService { return entity; } + private void validateGroupAccess(SkipPriceAsinEntity entity, Long operatorId, boolean superAdmin) { + shopManageGroupService.getAccessibleById(entity.getGroupId(), operatorId, superAdmin); + } + private SkipPriceAsinItemVo toItemVo(SkipPriceAsinEntity entity, String groupName) { SkipPriceAsinItemVo vo = new SkipPriceAsinItemVo(); vo.setId(entity.getId()); @@ -176,6 +192,27 @@ public class SkipPriceAsinService { return normalized; } + private Map normalizeCountryAsinMap(Set countries, SkipPriceAsinCreateRequest 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)) { @@ -228,10 +265,6 @@ public class SkipPriceAsinService { && normalizeBlank(entity.getAsinEs()).isEmpty(); } - /** - * 按店铺名列表批量查询跳过跟价ASIN，返回 Map{shopName -> {countryCode -> asin列表}} - * 用于跟价任务创建时将skip ASIN数据下发给Python队列 - */ public Map> listSkipAsinsByShops(List shopNames) { if (shopNames == null || shopNames.isEmpty()) { return Map.of(); @@ -252,4 +285,37 @@ public class SkipPriceAsinService { } return result; } + + public Map> listAllSkipAsinsByCountry() { + List rows = skipPriceAsinMapper.selectList( + new LambdaQueryWrapper() + .orderByDesc(SkipPriceAsinEntity::getId)); + Map> grouped = new LinkedHashMap<>(); + grouped.put("DE", new LinkedHashSet<>()); + grouped.put("UK", new LinkedHashSet<>()); + grouped.put("FR", new LinkedHashSet<>()); + grouped.put("IT", new LinkedHashSet<>()); + grouped.put("ES", new LinkedHashSet<>()); + + for (SkipPriceAsinEntity row : rows) { + addCountryAsin(grouped.get("DE"), row.getAsinDe()); + addCountryAsin(grouped.get("UK"), row.getAsinUk()); + addCountryAsin(grouped.get("FR"), row.getAsinFr()); + addCountryAsin(grouped.get("IT"), row.getAsinIt()); + addCountryAsin(grouped.get("ES"), row.getAsinEs()); + } + + Map> result = new LinkedHashMap<>(); + for (Map.Entry> entry : grouped.entrySet()) { + result.put(entry.getKey(), List.copyOf(entry.getValue())); + } + return result; + } + + private void addCountryAsin(Set bucket, String asin) { + String normalized = normalizeBlank(asin); + if (!normalized.isEmpty()) { + bucket.add(normalized); + } + } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/controller/ShopMatchController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/controller/ShopMatchController.java index 0e4d174..afd9300 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/controller/ShopMatchController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/controller/ShopMatchController.java @@ -163,6 +163,12 @@ public class ShopMatchController { return ApiResponse.success(shopMatchTaskService.getTaskDetailsBatch(request.getTaskIds())); } + @PostMapping("/tasks/progress/batch") + @Operation(summary = "批量查询任务进度摘要", description = "仅返回任务状态、阶段信息与时间等轻量字段，供前端轮询降载。") + public ApiResponse taskProgressBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) { + return ApiResponse.success(shopMatchTaskService.getTaskProgressBatch(request.getTaskIds())); + } + @PostMapping("/tasks/{taskId}/result") @Operation(summary = "提交匹配结果", description = "Python 可多次分批回传结果；后端会组装文件并在超时场景自动补偿收尾。") public ApiResponse submitResult( diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskCacheService.java index 31a908a..1f98db7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskCacheService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskCacheService.java @@ -5,10 +5,17 @@ import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.modules.shopmatch.model.dto.ShopMatchShopPayloadDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.security.MessageDigest; import java.time.Duration; +import java.util.Comparator; +import java.util.HexFormat; import java.util.LinkedHashMap; import java.util.Map; @@ -19,21 +26,29 @@ public class ShopMatchTaskCacheService { private static final long PAYLOAD_TTL_HOURS = 24; - private final StringRedisTemplate stringRedisTemplate; private final ObjectMapper objectMapper; public ShopMatchShopPayloadDto getShopMergedPayload(Long taskId, String shopKey) { if (taskId == null || taskId <= 0 || shopKey == null || shopKey.isBlank()) { return null; } - Object raw = stringRedisTemplate.opsForHash().get(buildShopPayloadKey(taskId), shopKey); - if (!(raw instanceof String json) || json.isBlank()) { + Path file = buildShopPayloadFile(taskId, shopKey); + if (!Files.isRegularFile(file)) { return null; } try { - return objectMapper.readValue(json, ShopMatchShopPayloadDto.class); + PayloadFile payloadFile = objectMapper.readValue(Files.readString(file), PayloadFile.class); + if (payloadFile == null || payloadFile.payload == null) { + return null; + } + if (payloadFile.shopKey == null || !shopKey.equals(payloadFile.shopKey)) { + log.warn("[shop-match] payload file shop key mismatch taskId={} shopKey={} storedKey={}", + taskId, shopKey, payloadFile.shopKey); + return null; + } + return payloadFile.payload; } catch (Exception ex) { - throw new BusinessException("读取匹配店铺缓存失败"); + throw new BusinessException("璇诲彇鍖归厤搴楅摵缂撳瓨澶辫触"); } } @@ -42,11 +57,16 @@ public class ShopMatchTaskCacheService { return; } try { - String key = buildShopPayloadKey(taskId); - stringRedisTemplate.opsForHash().put(key, shopKey, objectMapper.writeValueAsString(payload)); - stringRedisTemplate.expire(key, Duration.ofHours(PAYLOAD_TTL_HOURS)); + Files.createDirectories(buildTaskDir(taskId)); + Files.writeString( + buildShopPayloadFile(taskId, shopKey), + objectMapper.writeValueAsString(new PayloadFile(shopKey, payload)), + StandardOpenOption.CREATE, + StandardOpenOption.TRUNCATE_EXISTING, + StandardOpenOption.WRITE + ); } catch (Exception ex) { - throw new BusinessException("暂存匹配店铺结果失败"); + throw new BusinessException("鏆傚瓨鍖归厤搴楅摵缁撴灉澶辫触"); } } @@ -54,25 +74,52 @@ public class ShopMatchTaskCacheService { if (taskId == null || taskId <= 0 || shopKey == null || shopKey.isBlank()) { return; } - stringRedisTemplate.opsForHash().delete(buildShopPayloadKey(taskId), shopKey); + try { + Files.deleteIfExists(buildShopPayloadFile(taskId, shopKey)); + } catch (IOException ex) { + log.warn("[shop-match] delete shop payload failed taskId={} shopKey={} msg={}", taskId, shopKey, ex.getMessage()); + } } public Map getAllShopMergedPayload(Long taskId) { try { - Map raw = stringRedisTemplate.opsForHash().entries(buildShopPayloadKey(taskId)); - if (raw == null || raw.isEmpty()) { + Path taskDir = buildTaskDir(taskId); + if (!Files.isDirectory(taskDir)) { return Map.of(); } LinkedHashMap out = new LinkedHashMap<>(); - for (Map.Entry entry : raw.entrySet()) { - if (!(entry.getKey() instanceof String key) || !(entry.getValue() instanceof String val) || val.isBlank()) { - continue; + try (var stream = Files.list(taskDir)) { + for (Path path : stream + .filter(file -> file.getFileName().toString().endsWith(".json")) + .sorted(Comparator.comparing(file -> file.getFileName().toString())) + .toList()) { + PayloadFile payloadFile = objectMapper.readValue(Files.readString(path), PayloadFile.class); + if (payloadFile == null || payloadFile.shopKey == null || payloadFile.shopKey.isBlank() || payloadFile.payload == null) { + continue; + } + out.put(payloadFile.shopKey, payloadFile.payload); } - out.put(key, objectMapper.readValue(val, ShopMatchShopPayloadDto.class)); } return out; } catch (Exception ex) { - throw new BusinessException("读取匹配店铺缓存失败"); + throw new BusinessException("璇诲彇鍖归厤搴楅摵缂撳瓨澶辫触"); + } + } + + public boolean hasAnyShopMergedPayload(Long taskId) { + if (taskId == null || taskId <= 0) { + return false; + } + Path taskDir = buildTaskDir(taskId); + if (!Files.isDirectory(taskDir)) { + return false; + } + try (var stream = Files.list(taskDir)) { + return stream.anyMatch(file -> Files.isRegularFile(file) + && file.getFileName().toString().endsWith(".json")); + } catch (IOException ex) { + log.warn("[shop-match] scan task cache failed taskId={} msg={}", taskId, ex.getMessage()); + return false; } } @@ -81,13 +128,57 @@ public class ShopMatchTaskCacheService { return; } try { - stringRedisTemplate.delete(buildShopPayloadKey(taskId)); + Path taskDir = buildTaskDir(taskId); + if (!Files.exists(taskDir)) { + return; + } + try (var walk = Files.walk(taskDir)) { + walk.sorted(Comparator.reverseOrder()).forEach(path -> { + try { + Files.deleteIfExists(path); + } catch (IOException ex) { + log.warn("[shop-match] delete task cache path failed taskId={} path={} msg={}", + taskId, path, ex.getMessage()); + } + }); + } } catch (Exception ex) { log.warn("[shop-match] delete task cache failed taskId={} msg={}", taskId, ex.getMessage()); } } - private String buildShopPayloadKey(Long taskId) { - return "shop-match:task:shop-payload:" + taskId; + public Duration getPayloadTtl() { + return Duration.ofHours(PAYLOAD_TTL_HOURS); + } + + private Path buildTaskDir(Long taskId) { + return Path.of(System.getProperty("java.io.tmpdir"), "shop-match-cache", String.valueOf(taskId)); + } + + private Path buildShopPayloadFile(Long taskId, String shopKey) { + return buildTaskDir(taskId).resolve(hashShopKey(shopKey) + ".json"); + } + + private String hashShopKey(String shopKey) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + byte[] bytes = digest.digest(shopKey.trim().getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(bytes); + } catch (Exception ex) { + throw new IllegalStateException("failed to hash shop key", ex); + } + } + + private static class PayloadFile { + public String shopKey; + public ShopMatchShopPayloadDto payload; + + public PayloadFile() { + } + + public PayloadFile(String shopKey, ShopMatchShopPayloadDto payload) { + this.shopKey = shopKey; + this.payload = payload; + } } } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java index b37b684..c308662 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java @@ -185,6 +185,25 @@ public class ShopMatchTaskService { return batch; } + public ProductRiskTaskBatchVo getTaskProgressBatch(List taskIds) { + ProductRiskTaskBatchVo batch = new ProductRiskTaskBatchVo(); + if (taskIds == null || taskIds.isEmpty()) { + return batch; + } + for (Long taskId : taskIds) { + if (taskId == null || taskId <= 0) { + continue; + } + FileTaskEntity task = fileTaskMapper.selectById(taskId); + if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + batch.getMissingTaskIds().add(taskId); + continue; + } + batch.getItems().add(buildTaskProgressDetail(task)); + } + 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())) { @@ -376,7 +395,7 @@ public class ShopMatchTaskService { throw new BusinessException("任务不存在"); } if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { - throw new BusinessException("任务已结束，拒绝重复提交"); + throw new BusinessException(40901, "任务已结束，拒绝重复提交"); } List resultRows = fileResultMapper.selectList(new LambdaQueryWrapper() @@ -595,7 +614,11 @@ public class ShopMatchTaskService { task.setSuccessFileCount(ok); task.setFailedFileCount(fail); task.setUpdatedAt(now()); - if (!allDone) { + if (shouldRemainRunningUntilNextStage(task)) { + task.setStatus("RUNNING"); + task.setErrorMessage(null); + task.setFinishedAt(null); + } else if (!allDone) { task.setStatus("RUNNING"); task.setErrorMessage(null); task.setFinishedAt(null); @@ -623,6 +646,18 @@ public class ShopMatchTaskService { } } + private boolean shouldRemainRunningUntilNextStage(FileTaskEntity task) { + ShopMatchCreateTaskRequest request = parseTaskRequestSilently(task); + if (request == null || request.getScheduleTimes() == null || request.getScheduleTimes().isEmpty()) { + return false; + } + Integer activeStageIndex = request.getActiveStageIndex(); + if (activeStageIndex == null) { + return false; + } + return activeStageIndex < request.getScheduleTimes().size() - 1; + } + private ProductRiskTaskDetailVo buildTaskDetail(FileTaskEntity task) { ProductRiskTaskDetailVo detail = new ProductRiskTaskDetailVo(); detail.setTask(toTaskItemVo(task)); @@ -636,6 +671,12 @@ public class ShopMatchTaskService { return detail; } + private ProductRiskTaskDetailVo buildTaskProgressDetail(FileTaskEntity task) { + ProductRiskTaskDetailVo detail = new ProductRiskTaskDetailVo(); + detail.setTask(toTaskItemVo(task)); + return detail; + } + private List buildSnapshotFromDb(Long taskId, String taskStatus) { List rows = fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getTaskId, taskId) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java index 524de90..ad2477e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/split/service/SplitRunService.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.common.util.ExcelStreamReader; import com.nanri.aiimage.config.StorageProperties; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; import com.nanri.aiimage.modules.split.model.dto.SplitRunRequest; @@ -17,20 +18,14 @@ 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 lombok.RequiredArgsConstructor; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.DataFormatter; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.nio.file.Files; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -217,84 +212,119 @@ public class SplitRunService { String originalFilename, SplitRunRequest request ) throws Exception { - DataFormatter formatter = new DataFormatter(); - try (FileInputStream fis = new FileInputStream(inputFile); - Workbook workbook = WorkbookFactory.create(fis)) { - Sheet sheet = workbook.getSheetAt(0); - Row headerRow = sheet.getRow(0); - if (headerRow == null) { - throw new BusinessException("Excel header row is empty."); - } - - Map headerMap = buildHeaderMap(headerRow, formatter); - List missing = request.getSelectedColumns().stream() - .filter(column -> !headerMap.containsKey(column)) - .toList(); - if (!missing.isEmpty()) { - throw new BusinessException("Missing required columns: " + String.join(", ", missing)); - } - - List> rowsData = new ArrayList<>(); - for (int rowNum = 1; rowNum <= sheet.getLastRowNum(); rowNum++) { - Row row = sheet.getRow(rowNum); - if (row == null) { - continue; - } - List projected = new ArrayList<>(); - for (String column : request.getSelectedColumns()) { - Integer sourceIndex = headerMap.get(column); - String value = sourceIndex == null - ? "" - : normalizeCellText(formatter.formatCellValue(row.getCell(sourceIndex))); - projected.add(value); - } - rowsData.add(projected); - } - - if (rowsData.isEmpty()) { - throw new BusinessException("No data rows available for splitting."); - } - - List>> chunks = buildChunks(rowsData, request); - File outputDir = FileUtil.mkdir(FileUtil.file(storageProperties.getLocalTempDir(), "split-result")); - String sourceStem = FileUtil.mainName(originalFilename); - List results = new ArrayList<>(); - - for (int i = 0; i < chunks.size(); i++) { - File outputFile = buildNamedOutputFile(outputDir, sourceStem + "_split_" + (i + 1) + ".xlsx"); - try (XSSFWorkbook outputWorkbook = new XSSFWorkbook()) { - Sheet outputSheet = outputWorkbook.createSheet(sheet.getSheetName()); - Row outputHeaderRow = outputSheet.createRow(0); - for (int colIndex = 0; colIndex < request.getSelectedColumns().size(); colIndex++) { - outputHeaderRow.createCell(colIndex).setCellValue(request.getSelectedColumns().get(colIndex)); - } - int outputRowIndex = 1; - for (List rowValues : chunks.get(i)) { - Row outputRow = outputSheet.createRow(outputRowIndex++); - for (int colIndex = 0; colIndex < rowValues.size(); colIndex++) { - outputRow.createCell(colIndex).setCellValue(rowValues.get(colIndex)); - } - } - try (FileOutputStream fos = new FileOutputStream(outputFile)) { - outputWorkbook.write(fos); - } - } - results.add(new SplitChunkResult(outputFile, chunks.get(i).size())); - } - - return results; + CountResult countResult = countSplitRows(inputFile, request.getSelectedColumns()); + if (countResult.rowCount() <= 0) { + throw new BusinessException("No data rows available for splitting."); } + + List chunkSizes = buildChunkSizes(countResult.rowCount(), request); + File outputDir = FileUtil.mkdir(FileUtil.file(storageProperties.getLocalTempDir(), "split-result")); + String sourceStem = FileUtil.mainName(originalFilename); + List results = new ArrayList<>(); + List writers = new ArrayList<>(); + try { + for (int i = 0; i < chunkSizes.size(); i++) { + File outputFile = buildNamedOutputFile(outputDir, sourceStem + "_split_" + (i + 1) + ".xlsx"); + ChunkWriter writer = new ChunkWriter(outputFile, countResult.sheetName(), request.getSelectedColumns(), chunkSizes.get(i)); + writers.add(writer); + results.add(new SplitChunkResult(outputFile, chunkSizes.get(i))); + } + + Map[] headerMapHolder = new Map[]{null}; + int[] chunkIndex = new int[]{0}; + ExcelStreamReader.readFirstSheet(inputFile, new ExcelStreamReader.SheetRowHandler() { + @Override + public void onHeader(String sheetName, Integer sheetNo, Map headerMap) { + Map resolvedHeaderMap = buildHeaderMap(headerMap); + List missing = request.getSelectedColumns().stream() + .filter(column -> !resolvedHeaderMap.containsKey(column)) + .toList(); + if (!missing.isEmpty()) { + throw new BusinessException("Missing required columns: " + String.join(", ", missing)); + } + headerMapHolder[0] = resolvedHeaderMap; + } + + @Override + public void onRow(String sheetName, Integer sheetNo, int rowIndex, Map headerMap, Map rowMap) throws Exception { + if (chunkIndex[0] >= writers.size()) { + return; + } + Map resolvedHeaderMap = headerMapHolder[0]; + if (resolvedHeaderMap == null) { + throw new BusinessException("Excel header row is empty."); + } + List projected = new ArrayList<>(); + for (String column : request.getSelectedColumns()) { + Integer sourceIndex = resolvedHeaderMap.get(column); + projected.add(sourceIndex == null ? "" : normalizeCellText(rowMap.get(sourceIndex))); + } + ChunkWriter writer = writers.get(chunkIndex[0]); + writer.writeRow(projected); + if (writer.isFull()) { + chunkIndex[0]++; + } + } + }); + } finally { + IOException closeException = null; + for (ChunkWriter writer : writers) { + try { + writer.close(); + } catch (IOException ex) { + if (closeException == null) { + closeException = ex; + } + } + } + if (closeException != null) { + throw closeException; + } + } + + return results; } - private Map buildHeaderMap(Row headerRow, DataFormatter formatter) { + private CountResult countSplitRows(File inputFile, List selectedColumns) throws IOException { + int[] rowCount = new int[]{0}; + String[] sheetName = new String[]{"Sheet1"}; + boolean[] headerRead = new boolean[]{false}; + ExcelStreamReader.readFirstSheet(inputFile, new ExcelStreamReader.SheetRowHandler() { + @Override + public void onHeader(String currentSheetName, Integer sheetNo, Map headerMap) { + Map resolvedHeaderMap = buildHeaderMap(headerMap); + List missing = selectedColumns.stream() + .filter(column -> !resolvedHeaderMap.containsKey(column)) + .toList(); + if (!missing.isEmpty()) { + throw new BusinessException("Missing required columns: " + String.join(", ", missing)); + } + sheetName[0] = currentSheetName == null || currentSheetName.isBlank() ? "Sheet1" : currentSheetName; + headerRead[0] = true; + } + + @Override + public void onRow(String currentSheetName, Integer sheetNo, int rowIndex, Map headerMap, Map rowMap) { + if (!headerRead[0]) { + throw new BusinessException("Excel header row is empty."); + } + rowCount[0]++; + } + }); + if (!headerRead[0]) { + throw new BusinessException("Excel header row is empty."); + } + return new CountResult(rowCount[0], sheetName[0]); + } + + private Map buildHeaderMap(Map headerRow) { Map headerMap = new HashMap<>(); - for (int i = 0; i < headerRow.getLastCellNum(); i++) { - Cell cell = headerRow.getCell(i); - String value = normalizeHeaderName(cell == null ? null : formatter.formatCellValue(cell)); + for (Map.Entry entry : headerRow.entrySet()) { + String value = normalizeHeaderName(entry.getValue()); if (value.isBlank() || headerMap.containsKey(value)) { continue; } - headerMap.put(value, i); + headerMap.put(value, entry.getKey()); if (HEADER_STOP_COLUMN.equals(value)) { break; } @@ -302,14 +332,13 @@ public class SplitRunService { return headerMap; } - private List>> buildChunks(List> rowsData, SplitRunRequest request) { - int totalRows = rowsData.size(); - List>> chunks = new ArrayList<>(); + private List buildChunkSizes(int totalRows, SplitRunRequest request) { + List chunks = new ArrayList<>(); if (SPLIT_MODE_ROWS_PER_FILE.equals(request.getSplitMode())) { int chunkSize = request.getRowsPerFile(); for (int i = 0; i < totalRows; i += chunkSize) { - chunks.add(rowsData.subList(i, Math.min(i + chunkSize, totalRows))); + chunks.add(Math.min(chunkSize, totalRows - i)); } return chunks; } @@ -317,12 +346,8 @@ public class SplitRunService { int actualParts = Math.min(request.getParts(), totalRows); int base = totalRows / actualParts; int remainder = totalRows % actualParts; - int start = 0; for (int i = 0; i < actualParts; i++) { - int size = base + (i < remainder ? 1 : 0); - int end = start + size; - chunks.add(rowsData.subList(start, end)); - start = end; + chunks.add(base + (i < remainder ? 1 : 0)); } return chunks; } @@ -448,4 +473,48 @@ public class SplitRunService { private record TaskSplitChunkResult(String relativePath, String sourceFilename, File outputFile, int rowCount) { } + + private record CountResult(int rowCount, String sheetName) { + } + + private static final class ChunkWriter implements AutoCloseable { + private final File outputFile; + private final SXSSFWorkbook workbook; + private final org.apache.poi.ss.usermodel.Sheet sheet; + private final int rowLimit; + private int writtenRows; + + private ChunkWriter(File outputFile, String sheetName, List columns, int rowLimit) { + this.outputFile = outputFile; + this.rowLimit = rowLimit; + this.workbook = new SXSSFWorkbook(200); + this.sheet = workbook.createSheet(sheetName == null || sheetName.isBlank() ? "Sheet1" : sheetName); + org.apache.poi.ss.usermodel.Row headerRow = sheet.createRow(0); + for (int i = 0; i < columns.size(); i++) { + headerRow.createCell(i).setCellValue(columns.get(i)); + } + } + + private void writeRow(List values) { + org.apache.poi.ss.usermodel.Row outputRow = sheet.createRow(writtenRows + 1); + for (int colIndex = 0; colIndex < values.size(); colIndex++) { + outputRow.createCell(colIndex).setCellValue(values.get(colIndex)); + } + writtenRows++; + } + + private boolean isFull() { + return writtenRows >= rowLimit; + } + + @Override + public void close() throws IOException { + try (FileOutputStream fos = new FileOutputStream(outputFile)) { + workbook.write(fos); + } finally { + workbook.dispose(); + workbook.close(); + } + } + } } diff --git a/backend-java/src/main/resources/application.yml b/backend-java/src/main/resources/application.yml index 066b61c..26247eb 100644 --- a/backend-java/src/main/resources/application.yml +++ b/backend-java/src/main/resources/application.yml @@ -82,12 +82,12 @@ aiimage: heartbeat-timeout-minutes: ${AIIMAGE_DELETE_BRAND_HEARTBEAT_TIMEOUT_MINUTES:15} stale-check-cron: ${AIIMAGE_DELETE_BRAND_STALE_CHECK_CRON:*/30 * * * * *} finalize-check-cron: ${AIIMAGE_DELETE_BRAND_FINALIZE_CHECK_CRON:30 */2 * * * *} - product-risk-stale-timeout-minutes: ${AIIMAGE_PRODUCT_RISK_STALE_TIMEOUT_MINUTES:10} - product-risk-initial-timeout-minutes: ${AIIMAGE_PRODUCT_RISK_INITIAL_TIMEOUT_MINUTES:10} - price-track-stale-timeout-minutes: ${AIIMAGE_PRICE_TRACK_STALE_TIMEOUT_MINUTES:10} - price-track-initial-timeout-minutes: ${AIIMAGE_PRICE_TRACK_INITIAL_TIMEOUT_MINUTES:10} - shop-match-stale-timeout-minutes: ${AIIMAGE_SHOP_MATCH_STALE_TIMEOUT_MINUTES:10} - shop-match-initial-timeout-minutes: ${AIIMAGE_SHOP_MATCH_INITIAL_TIMEOUT_MINUTES:10} + product-risk-stale-timeout-minutes: ${AIIMAGE_PRODUCT_RISK_STALE_TIMEOUT_MINUTES:20} + product-risk-initial-timeout-minutes: ${AIIMAGE_PRODUCT_RISK_INITIAL_TIMEOUT_MINUTES:20} + price-track-stale-timeout-minutes: ${AIIMAGE_PRICE_TRACK_STALE_TIMEOUT_MINUTES:20} + price-track-initial-timeout-minutes: ${AIIMAGE_PRICE_TRACK_INITIAL_TIMEOUT_MINUTES:20} + shop-match-stale-timeout-minutes: ${AIIMAGE_SHOP_MATCH_STALE_TIMEOUT_MINUTES:20} + shop-match-initial-timeout-minutes: ${AIIMAGE_SHOP_MATCH_INITIAL_TIMEOUT_MINUTES:20} module-cleanup: enabled: ${AIIMAGE_MODULE_CLEANUP_ENABLED:true} cron: ${AIIMAGE_MODULE_CLEANUP_CRON:0 0 0 * * *} diff --git a/backend-java/src/main/resources/db/V24__price_track_tables.sql b/backend-java/src/main/resources/db/V24__price_track_tables.sql new file mode 100644 index 0000000..f10c436 --- /dev/null +++ b/backend-java/src/main/resources/db/V24__price_track_tables.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS biz_price_track_shop_candidate ( + id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT 'primary key', + user_id BIGINT NOT NULL COMMENT 'user id', + shop_name VARCHAR(255) NOT NULL COMMENT 'normalized shop name', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'created time', + UNIQUE KEY uk_user_shop (user_id, shop_name), + KEY idx_user_id (user_id) +) COMMENT='price track candidate shops'; + +CREATE TABLE IF NOT EXISTS biz_price_track_country_pref ( + user_id BIGINT NOT NULL PRIMARY KEY COMMENT 'user id', + country_codes_json VARCHAR(256) NOT NULL COMMENT 'country code order json', + updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'updated time' +) COMMENT='price track country preference'; diff --git a/backend-java/src/main/resources/db/V25__permission_menu_sort_order.sql b/backend-java/src/main/resources/db/V25__permission_menu_sort_order.sql new file mode 100644 index 0000000..74322ce --- /dev/null +++ b/backend-java/src/main/resources/db/V25__permission_menu_sort_order.sql @@ -0,0 +1,6 @@ +ALTER TABLE `columns` + ADD COLUMN `sort_order` INT NOT NULL DEFAULT 0 COMMENT '菜单排序' AFTER `route_path`; + +UPDATE `columns` +SET `sort_order` = `id` +WHERE `sort_order` = 0; diff --git a/backend-java/src/main/resources/db/V25__shop_manage_group_bind_user.sql b/backend-java/src/main/resources/db/V25__shop_manage_group_bind_user.sql new file mode 100644 index 0000000..af919d6 --- /dev/null +++ b/backend-java/src/main/resources/db/V25__shop_manage_group_bind_user.sql @@ -0,0 +1,55 @@ +SET @db_name = DATABASE(); + +SET @user_id_col_exists := ( + SELECT COUNT(*) + FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = @db_name + AND TABLE_NAME = 'biz_shop_manage_group' + AND COLUMN_NAME = 'user_id' +); + +SET @sql_add_user_id_col := IF(@user_id_col_exists = 0, + 'ALTER TABLE biz_shop_manage_group ADD COLUMN user_id BIGINT NULL COMMENT ''关联用户ID'' AFTER group_name', + 'SELECT 1' +); +PREPARE stmt_add_user_id_col FROM @sql_add_user_id_col; +EXECUTE stmt_add_user_id_col; +DEALLOCATE PREPARE stmt_add_user_id_col; + +UPDATE biz_shop_manage_group g +LEFT JOIN users u ON u.username = g.group_name +SET g.user_id = u.id +WHERE g.user_id IS NULL + AND u.id IS NOT NULL; + +SET @user_id_idx_exists := ( + SELECT COUNT(*) + FROM information_schema.STATISTICS + WHERE TABLE_SCHEMA = @db_name + AND TABLE_NAME = 'biz_shop_manage_group' + AND INDEX_NAME = 'idx_user_id' +); + +SET @sql_add_user_id_idx := IF(@user_id_idx_exists = 0, + 'ALTER TABLE biz_shop_manage_group ADD INDEX idx_user_id (user_id)', + 'SELECT 1' +); +PREPARE stmt_add_user_id_idx FROM @sql_add_user_id_idx; +EXECUTE stmt_add_user_id_idx; +DEALLOCATE PREPARE stmt_add_user_id_idx; + +SET @user_id_uk_exists := ( + SELECT COUNT(*) + FROM information_schema.STATISTICS + WHERE TABLE_SCHEMA = @db_name + AND TABLE_NAME = 'biz_shop_manage_group' + AND INDEX_NAME = 'uk_user_id' +); + +SET @sql_add_user_id_uk := IF(@user_id_uk_exists = 0, + 'ALTER TABLE biz_shop_manage_group ADD UNIQUE KEY uk_user_id (user_id)', + 'SELECT 1' +); +PREPARE stmt_add_user_id_uk FROM @sql_add_user_id_uk; +EXECUTE stmt_add_user_id_uk; +DEALLOCATE PREPARE stmt_add_user_id_uk; diff --git a/backend/__pycache__/config.cpython-312.pyc b/backend/__pycache__/config.cpython-312.pyc index 57fc226f5d7255b16ddbf4efe022298ae6eb1d8c..8a02d24c8df3cd8ab635c7c3caa642aafd4bd0b3 100644 GIT binary patch delta 20 acmaFH{fwLYG%qg~0}!;&d$^JNHY)%^ng)LW delta 20 acmaFH{fwLYG%qg~0}#BBy1SA4HY)%^6$V%U diff --git a/backend/blueprints/__pycache__/admin_api.cpython-312.pyc b/backend/blueprints/__pycache__/admin_api.cpython-312.pyc index 268c8ae2e9b88c92e6366e1ba14175d0e1c509ac..4b38d6bfa5382dc85954c23c0ea5130358131aae 100644 GIT binary patch literal 84968 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

+N3w{}WXZ3^K+3 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 diff --git a/backend/blueprints/admin_api.py b/backend/blueprints/admin_api.py index c225db2..c5a0e46 100644 --- a/backend/blueprints/admin_api.py +++ b/backend/blueprints/admin_api.py @@ -62,6 +62,34 @@ ADMIN_MENU_ACCESS_CONFIG = { }, } +ADMIN_MENU_ACCESS_CONFIG.update({ + 'users': { + 'column_key': 'admin_users', + 'route_path': 'users', + 'error': '无权访问用户管理模块', + }, + 'columns': { + 'column_key': 'admin_columns', + 'route_path': 'columns', + 'error': '无权访问栏目权限配置模块', + }, + 'shop-keys': { + 'column_key': 'admin_shop_keys', + 'route_path': 'shop-keys', + 'error': '无权访问店铺密钥管理模块', + }, + 'history': { + 'column_key': 'admin_history', + 'route_path': 'history', + 'error': '无权访问查看生成记录模块', + }, + 'version': { + 'column_key': 'admin_version', + 'route_path': 'version', + 'error': '无权访问版本管理模块', + }, +}) + def _safe_version_key(version): """将版本号转换为安全的 OSS 对象名片段""" @@ -98,10 +126,155 @@ def _format_permission_item(item): 'column_key': item.get('columnKey') or '', 'menu_type': item.get('menuType') or 'app', 'route_path': item.get('routePath') or '', + 'sort_order': item.get('sortOrder') if item.get('sortOrder') is not None else 0, 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], } +def _parse_optional_int(value): + if value is None: + return None + text = str(value).strip() + if text == '': + return None + return int(text) + + +def _ensure_column_sort_schema(): + conn = get_db() + try: + with conn.cursor() as cur: + try: + cur.execute("ALTER TABLE columns ADD COLUMN sort_order INT NOT NULL DEFAULT 0 COMMENT '菜单排序' AFTER route_path") + except Exception: + pass + try: + cur.execute("UPDATE columns SET sort_order = id WHERE sort_order IS NULL OR sort_order = 0") + except Exception: + pass + conn.commit() + finally: + conn.close() + + +def _load_local_column_sort_map(): + _ensure_column_sort_schema() + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute("SELECT id, sort_order FROM columns") + rows = cur.fetchall() + return {int(row['id']): int(row.get('sort_order') or 0) for row in rows if row.get('id') is not None} + finally: + conn.close() + + +def _load_local_columns(menu_type=None): + _ensure_column_sort_schema() + conn = get_db() + try: + with conn.cursor() as cur: + sql = """ + SELECT id, name, column_key, menu_type, route_path, sort_order, created_at + FROM columns + """ + params = [] + if menu_type: + sql += " WHERE menu_type = %s" + params.append(menu_type) + sql += " ORDER BY sort_order ASC, id ASC" + cur.execute(sql, params) + return cur.fetchall() + finally: + conn.close() + + +def _sync_local_columns_from_backend(items): + if not items: + return + _ensure_column_sort_schema() + conn = get_db() + try: + with conn.cursor() as cur: + for item in items: + item_id = item.get('id') + if item_id is None: + continue + sort_order = item.get('sort_order') + cur.execute( + """ + INSERT INTO columns (id, name, column_key, menu_type, route_path, sort_order, created_at) + VALUES (%s, %s, %s, %s, %s, %s, COALESCE(%s, NOW())) + ON DUPLICATE KEY UPDATE + name = VALUES(name), + column_key = VALUES(column_key), + menu_type = VALUES(menu_type), + route_path = VALUES(route_path), + sort_order = CASE + WHEN columns.sort_order IS NULL OR columns.sort_order = 0 THEN VALUES(sort_order) + ELSE columns.sort_order + END + """, + ( + int(item_id), + item.get('name') or '', + item.get('column_key') or '', + item.get('menu_type') or 'app', + item.get('route_path') or '', + int(sort_order if sort_order not in (None, '') else item_id), + item.get('created_at') or None, + ), + ) + conn.commit() + finally: + conn.close() + + +def _set_local_column_sort_order(column_id, sort_order): + _ensure_column_sort_schema() + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute( + "UPDATE columns SET sort_order = %s WHERE id = %s", + (int(sort_order), int(column_id)), + ) + conn.commit() + finally: + conn.close() + + +def _get_next_local_column_sort_order(): + _ensure_column_sort_schema() + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute("SELECT COALESCE(MAX(sort_order), 0) AS max_sort FROM columns") + row = cur.fetchone() or {} + return int(row.get('max_sort') or 0) + 1 + finally: + conn.close() + + +def _swap_local_column_sort_order(column_id, target_id): + _ensure_column_sort_schema() + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute("SELECT id, sort_order FROM columns WHERE id IN (%s, %s) ORDER BY id", (int(column_id), int(target_id))) + rows = cur.fetchall() + if len(rows) != 2: + raise ValueError('菜单不存在') + by_id = {int(row['id']): int(row.get('sort_order') or 0) for row in rows} + left_sort = by_id.get(int(column_id), 0) or int(column_id) + right_sort = by_id.get(int(target_id), 0) or int(target_id) + cur.execute("UPDATE columns SET sort_order = %s WHERE id = %s", (right_sort, int(column_id))) + cur.execute("UPDATE columns SET sort_order = %s WHERE id = %s", (left_sort, int(target_id))) + conn.commit() + finally: + conn.close() + + def _sync_user_column_permissions(user_id, column_ids): _, error_response, status = _proxy_backend_java( 'PUT', @@ -111,8 +284,14 @@ def _sync_user_column_permissions(user_id, column_ids): return error_response, status +def _get_current_admin_id(current_row=None): + if current_row and current_row.get('id'): + return current_row.get('id') + return session.get('user_id') + + def _get_current_admin_permission_sets(): - user_id = session.get('user_id') + user_id = _get_current_admin_id() if not user_id: return set(), set() conn = get_db() @@ -152,6 +331,60 @@ def _ensure_admin_menu_access(*menu_names): return role, current_row, (jsonify({'success': False, 'error': error_message}), 403) +def _ensure_dedupe_total_data_access(): + return _ensure_admin_menu_access('dedupe-total-data') + + +def _load_current_admin_menu_items(): + role, current_row = get_current_admin_role() + if not role or not current_row: + return None, None, None, (jsonify({'success': False, 'error': '需要管理员权限'}), 403) + user_id = _get_current_admin_id(current_row) + if not user_id: + return role, current_row, None, (jsonify({'success': False, 'error': '当前登录用户缺少有效ID'}), 400) + result, error_response, status = _proxy_backend_java( + 'GET', + f'/api/admin/permission-users/{user_id}/column-permissions', + params={'menuType': 'admin'}, + ) + if error_response is not None: + return role, current_row, None, (error_response, status) + items = [_format_permission_item(item) for item in (result.get('data') or [])] + return role, current_row, items, None + + +@admin_api.route('/current-user') +@admin_required +def get_admin_current_user(): + role, current_row = get_current_admin_role() + if not role or not current_row: + return jsonify({'success': False, 'error': '需要管理员权限'}), 403 + return jsonify({ + 'success': True, + 'item': { + 'id': current_row.get('id'), + 'username': current_row.get('username') or session.get('username') or '', + 'role': role, + } + }) + + +@admin_api.route('/current-user/menus') +@admin_required +def get_admin_current_user_menus(): + _, _, items, denied = _load_current_admin_menu_items() + if denied: + return denied + return jsonify({'success': True, 'items': items}) + + +@admin_api.route('/logout', methods=['POST']) +@admin_required +def admin_logout(): + session.clear() + return jsonify({'success': True, 'msg': '退出成功', 'redirect': '/login'}) + + # ---------- 用户管理 ---------- @admin_api.route('/users') @@ -162,7 +395,13 @@ def list_users(): if not role: return jsonify({'success': False, 'error': '需要管理员权限'}), 403 page = max(1, int(request.args.get('page', 1))) - page_size = min(50, max(5, int(request.args.get('page_size', 15)))) + _, _, denied = _ensure_admin_menu_access('users', 'history', 'shop-manage', 'skip-price-asin') + if denied: + return denied + _, _, denied = _ensure_admin_menu_access('users', 'history', 'shop-manage', 'skip-price-asin') + if denied: + return denied + page_size = min(999, max(5, int(request.args.get('page_size', 15)))) offset = (page - 1) * page_size search_username = (request.args.get('username') or request.args.get('search') or '').strip() created_by_id_arg = request.args.get('created_by_id') or request.args.get('admin_id') @@ -249,6 +488,9 @@ def list_users(): @admin_api.route('/user', methods=['POST']) @admin_required def create_user(): + _, _, denied = _ensure_admin_menu_access('users') + if denied: + return denied data = request.get_json() or {} username = (data.get('username') or '').strip() password = data.get('password') or '' @@ -312,6 +554,9 @@ def create_user(): def update_user(uid): """更新用户（密码、角色）""" data = request.get_json() or {} + _, _, denied = _ensure_admin_menu_access('users') + if denied: + return denied password = data.get('password') want_role = (data.get('role') or '').strip() or data.get('role') role, current_row = get_current_admin_role() @@ -368,6 +613,9 @@ def update_user(uid): @admin_required def delete_user(uid): """删除用户""" + _, _, denied = _ensure_admin_menu_access('users') + if denied: + return denied if session.get('user_id') == uid: return jsonify({'success': False, 'error': '不能删除当前登录账号'}) role, current_row = get_current_admin_role() @@ -405,6 +653,9 @@ def delete_user(uid): @admin_required def history(): """管理员分页获取所有生成记录""" + _, _, denied = _ensure_admin_menu_access('history') + if denied: + return denied page = max(1, int(request.args.get('page', 1))) page_size = min(50, max(10, int(request.args.get('page_size', 15)))) offset = (page - 1) * page_size @@ -473,28 +724,49 @@ def history(): @admin_api.route('/columns') @admin_required def list_columns(): - params = {} + _, _, denied = _ensure_admin_menu_access('columns', 'users') + if denied: + return denied menu_type = (request.args.get('menu_type') or '').strip() - if menu_type: - params['menuType'] = menu_type + params = {'menuType': menu_type} if menu_type else None result, error_response, status = _proxy_backend_java( 'GET', '/api/admin/permission-menus', - params=params or None, + params=params, ) - if error_response is not None: - return error_response, status - return jsonify({'success': True, 'items': [_format_permission_item(item) for item in (result.get('data') or [])]}) + if error_response is None: + _sync_local_columns_from_backend([_format_permission_item(item) for item in (result.get('data') or [])]) + local_rows = _load_local_columns(menu_type or None) + items = [ + { + 'id': row.get('id'), + 'name': row.get('name') or '', + 'column_key': row.get('column_key') or '', + 'menu_type': row.get('menu_type') or 'app', + 'route_path': row.get('route_path') or '', + 'sort_order': int(row.get('sort_order') or 0), + 'created_at': str(row.get('created_at') or '')[:16].replace('T', ' '), + } + for row in local_rows + ] + return jsonify({'success': True, 'items': items}) @admin_api.route('/column', methods=['POST']) @admin_required def create_column(): + _, _, denied = _ensure_admin_menu_access('columns') + if denied: + return denied data = request.get_json() or {} name = (data.get('name') or '').strip() column_key = (data.get('column_key') or '').strip() - menu_type = (data.get('menu_type') or 'app').strip() or 'app' + menu_type = (data.get('menu_type') or '').strip() or 'admin' route_path = (data.get('route_path') or '').strip() + try: + sort_order = _parse_optional_int(data.get('sort_order')) + except (TypeError, ValueError): + return jsonify({'success': False, 'error': '排序必须是数字'}) if not name: return jsonify({'success': False, 'error': '栏目名不能为空'}) if not column_key: @@ -514,17 +786,27 @@ def create_column(): if error_response is not None: return error_response, status item = result.get('data') or {} + _sync_local_columns_from_backend([_format_permission_item(item)]) + if item.get('id') is not None: + _set_local_column_sort_order(item.get('id'), sort_order if sort_order is not None else _get_next_local_column_sort_order()) return jsonify({'success': True, 'msg': result.get('message') or '创建成功', 'id': item.get('id')}) @admin_api.route('/column/', methods=['PUT']) @admin_required def update_column(cid): + _, _, denied = _ensure_admin_menu_access('columns') + if denied: + return denied data = request.get_json() or {} name = (data.get('name') or '').strip() column_key = (data.get('column_key') or '').strip() - menu_type = (data.get('menu_type') or 'app').strip() or 'app' + menu_type = (data.get('menu_type') or '').strip() or 'admin' route_path = (data.get('route_path') or '').strip() + try: + sort_order = _parse_optional_int(data.get('sort_order')) + except (TypeError, ValueError): + return jsonify({'success': False, 'error': '排序必须是数字'}) if not name: return jsonify({'success': False, 'error': '栏目名不能为空'}) if not column_key: @@ -543,32 +825,76 @@ def update_column(cid): ) if error_response is not None: return error_response, status + _sync_local_columns_from_backend([{ + 'id': cid, + 'name': name, + 'column_key': column_key, + 'menu_type': menu_type, + 'route_path': route_path, + 'sort_order': sort_order if sort_order is not None else cid, + 'created_at': None, + }]) + if sort_order is not None: + _set_local_column_sort_order(cid, sort_order) return jsonify({'success': True, 'msg': result.get('message') or '更新成功'}) +@admin_api.route('/column/reorder', methods=['POST']) +@admin_required +def reorder_column(): + _, _, denied = _ensure_admin_menu_access('columns') + if denied: + return denied + data = request.get_json() or {} + try: + column_id = int(data.get('column_id')) + target_id = int(data.get('target_id')) + except (TypeError, ValueError): + return jsonify({'success': False, 'error': '菜单重排参数无效'}), 400 + if column_id == target_id: + return jsonify({'success': True, 'msg': '排序未变化'}) + try: + _swap_local_column_sort_order(column_id, target_id) + except ValueError as exc: + return jsonify({'success': False, 'error': str(exc)}), 400 + except Exception as exc: + return jsonify({'success': False, 'error': str(exc)}), 500 + return jsonify({'success': True, 'msg': '排序更新成功'}) + + @admin_api.route('/column/', methods=['DELETE']) @admin_required def delete_column(cid): + _, _, denied = _ensure_admin_menu_access('columns') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'DELETE', f'/api/admin/permission-menus/{cid}', ) if error_response is not None: return error_response, status + conn = get_db() + try: + with conn.cursor() as cur: + cur.execute("DELETE FROM columns WHERE id = %s", (cid,)) + conn.commit() + finally: + conn.close() return jsonify({'success': True, 'msg': result.get('message') or '删除成功'}) @admin_api.route('/user//columns') @admin_required def get_user_columns(uid): - params = {} + _, _, denied = _ensure_admin_menu_access('users') + if denied: + return denied menu_type = (request.args.get('menu_type') or '').strip() - if menu_type: - params['menuType'] = menu_type result, error_response, status = _proxy_backend_java( 'GET', f'/api/admin/permission-users/{uid}/columns', - params=params or None, + params={'menuType': menu_type} if menu_type else None, ) if error_response is not None: return error_response, status @@ -579,14 +905,14 @@ def get_user_columns(uid): @admin_api.route('/user//column-permissions') @admin_required def get_user_column_permissions(uid): - params = {} + _, _, denied = _ensure_admin_menu_access('users') + if denied: + return denied menu_type = (request.args.get('menu_type') or '').strip() - if menu_type: - params['menuType'] = menu_type result, error_response, status = _proxy_backend_java( 'GET', f'/api/admin/permission-users/{uid}/column-permissions', - params=params or None, + params={'menuType': menu_type} if menu_type else None, ) if error_response is not None: return error_response, status @@ -610,6 +936,9 @@ def _set_user_column_permissions(cur, user_id, column_ids): @admin_api.route('/versions') @admin_required def list_versions(): + _, _, denied = _ensure_admin_menu_access('version') + if denied: + return denied """获取版本列表""" try: conn = get_db() @@ -637,6 +966,9 @@ def list_versions(): @admin_required def upload_version(): """接收版本号 + zip 文件，上传到 OSS，写入 web_config""" + _, _, denied = _ensure_admin_menu_access('version') + if denied: + return denied version = (request.form.get('version') or '').strip() if not version: return jsonify({'success': False, 'error': '请填写版本号'}) @@ -675,6 +1007,9 @@ def upload_version(): @admin_api.route('/shop-keys') @admin_required def list_shop_keys(): + _, _, denied = _ensure_admin_menu_access('shop-keys') + 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)))) result, error_response, status = _proxy_backend_java( @@ -707,6 +1042,9 @@ def list_shop_keys(): @admin_api.route('/shop-key', methods=['POST']) @admin_required def create_shop_key(): + _, _, denied = _ensure_admin_menu_access('shop-keys') + if denied: + return denied data = request.get_json() or {} payload = { 'ziniaoAccountName': (data.get('ziniao_account_name') or '').strip(), @@ -736,6 +1074,9 @@ def create_shop_key(): @admin_api.route('/shop-key/', methods=['PUT']) @admin_required def update_shop_key(item_id): + _, _, denied = _ensure_admin_menu_access('shop-keys') + if denied: + return denied data = request.get_json() or {} payload = { 'ziniaoAccountName': (data.get('ziniao_account_name') or '').strip(), @@ -765,6 +1106,9 @@ def update_shop_key(item_id): @admin_api.route('/shop-key/', methods=['DELETE']) @admin_required def delete_shop_key(item_id): + _, _, denied = _ensure_admin_menu_access('shop-keys') + if denied: + return denied result, error_response, status = _proxy_backend_java( 'DELETE', f'/api/admin/shop-keys/{item_id}', @@ -1007,8 +1351,9 @@ def list_shop_manages(): shop_name = (request.args.get('shop_name') or '').strip() params = {'page': page, 'pageSize': page_size} - if role != 'super_admin' and current_row and current_row.get('id'): - params['createdById'] = current_row.get('id') + 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) @@ -1164,10 +1509,16 @@ def list_shop_manage_groups(): role, current_row, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') if denied: return denied + params = {} + if current_row and current_row.get('id'): + params['operatorId'] = current_row.get('id') + params['superAdmin'] = 'true' if role == 'super_admin' else 'false' + if role != 'super_admin' and current_row and current_row.get('id'): + params['createdById'] = current_row.get('id') result, error_response, status = _proxy_backend_java( 'GET', '/api/admin/shop-manages/groups', - params={'createdById': current_row.get('id')} if role != 'super_admin' and current_row and current_row.get('id') else None, + params=params, ) if error_response is not None: return error_response, status @@ -1175,6 +1526,8 @@ def list_shop_manage_groups(): { 'id': item.get('id'), 'group_name': item.get('groupName') or '', + 'user_id': item.get('userId'), + 'username': item.get('username') or '', 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], } @@ -1186,17 +1539,22 @@ def list_shop_manage_groups(): @admin_api.route('/shop-manage-group', methods=['POST']) @admin_required def create_shop_manage_group(): - _, current_row, denied = _ensure_admin_menu_access('shop-manage', 'skip-price-asin') + role, current_row, 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(), + 'userId': data.get('user_id'), 'createdById': current_row.get('id') if current_row else None, } result, error_response, status = _proxy_backend_java( 'POST', '/api/admin/shop-manages/groups', + 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: @@ -1208,6 +1566,8 @@ def create_shop_manage_group(): 'item': { 'id': item.get('id'), 'group_name': item.get('groupName') or '', + 'user_id': item.get('userId'), + 'username': item.get('username') or '', 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], }, @@ -1221,7 +1581,10 @@ def update_shop_manage_group(item_id): if denied: return denied data = request.get_json() or {} - payload = {'groupName': (data.get('group_name') or '').strip()} + payload = { + 'groupName': (data.get('group_name') or '').strip(), + 'userId': data.get('user_id'), + } result, error_response, status = _proxy_backend_java( 'PUT', f'/api/admin/shop-manages/groups/{item_id}', @@ -1240,6 +1603,8 @@ def update_shop_manage_group(item_id): 'item': { 'id': item.get('id'), 'group_name': item.get('groupName') or '', + 'user_id': item.get('userId'), + 'username': item.get('username') or '', 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], 'updated_at': (item.get('updatedAt') or '').replace('T', ' ')[:16], }, @@ -1249,7 +1614,7 @@ 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') + role, current_row, denied = _ensure_admin_menu_access('skip-price-asin') if denied: return denied page = max(1, int(request.args.get('page', 1))) @@ -1258,6 +1623,9 @@ def list_skip_price_asins(): 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) @@ -1305,19 +1673,31 @@ def list_skip_price_asins(): @admin_api.route('/skip-price-asin', methods=['POST']) @admin_required def create_skip_price_asin(): - _, _, denied = _ensure_admin_menu_access('skip-price-asin') + role, current_row, denied = _ensure_admin_menu_access('skip-price-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': (data.get('asin') or '').strip(), + 'asin': fallback_asin, + 'asinMappings': asin_mappings, } result, error_response, status = _proxy_backend_java( 'POST', '/api/admin/skip-price-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: @@ -1345,12 +1725,16 @@ def create_skip_price_asin(): @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') + role, current_row, 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}', + 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 @@ -1379,7 +1763,7 @@ def delete_shop_manage_group(item_id): @admin_api.route('/skip-price-asin//country/', methods=['PUT']) @admin_required def update_skip_price_asin_country(item_id, country): - _, _, denied = _ensure_admin_menu_access('skip-price-asin') + role, current_row, denied = _ensure_admin_menu_access('skip-price-asin') if denied: return denied data = request.get_json() or {} @@ -1387,6 +1771,10 @@ def update_skip_price_asin_country(item_id, country): result, error_response, status = _proxy_backend_java( 'PUT', f'/api/admin/skip-price-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: diff --git a/backend/utils/__pycache__/db.cpython-312.pyc b/backend/utils/__pycache__/db.cpython-312.pyc index 74e09849dc3c7efc744df9d3918552722660420a..7b0e8ace4856a93b43747b263bab1ed37729d453 100644 GIT binary patch delta 919 zcmYk3O-vI(6oBWaYr8EiUCYu!TUekC^+14F0tXN(6nB@OBD5+-ZIEI>DwwteH6TWf z!30E^cp=7cQ^N()gNgBA_=(*mnixHKF`8gJnI1gp#oa*@W-@QSdGqqV-OP)&FYUHn ztJMs&F~9zG>`v*1Z5S6iE)ETkk4z+Lr!r&7bZvG8CmFQPkPE0SE3&1CTsD`G>z0%H z4tes_QUQy}8%vmXu0g#O0I6d$DBXcjMzUS4!#0R3<)|N{plg zsW&S0Mzj^{?iM=2ouOEFRHzf$BRxG~?W+36(v!W#$KM|;@4Z^87DAoTaKDh6oXU*E zuMTBKNuRSXa-%2K*Aa?_h2hEM)Rl>}Fc6Lk2NW&BSVA~0hWo<@v(mu6Gtz%B+alCu zSDgzOej_#R3OJIDxXsX(2f%v*{Q`g!QT`CwaF-dzKiQKc?jfc*1Z?hn2PVHgr6`6- zv)500y$)@4|Jxm8#p{?0VXbcd{GYst0c%|{-#0H7{7#?KUi6v03xk&-UT(yjR!(%G z&2ml*pv`(tY(iU@lT2uY+!Qrl!H*`2FgvW#4rlfSusGJ8OkPB z;u(dbTm*IIDZ5z7&nUV8D?X?*?XLt_sew^weQnmX<}uDQK>*RK%J>THL)_! zs8pa9L7k~Ub+NLaQK>-nL7k~U4X|>MQR|T=R*yoRgZf9PjZ7CXs?A32?|1RxE*>AT Te>TSB3G%b-HJl)8(8$VEYJ&2y9G&M<+DACx)BqbHp zdQ?y%4u}U&Uc`$adk{QH637m{c<|z>e}T|ru@`3tgv<-W?|C2Qd6?bHpD(C8isC{1 z^!9((-J!2)MLLnXdbZGPZQQR_I)zHB+-=lasb*vIUVXi=R<1m#tyc@1oqD5Pu%1f| z8ID_jCRZ^1?g`Mc_ZHpvF47$@@wJwo;OcaUM?aNli3H#XE&1jk;M}z6JLIm0oS{E_ zMF`Qj5+G|`v?VR0E(lc`S8#{ESMnq`z9Xl{6=Z2njfTJc-yK64)P^nww2XkyD~mSO z49r*`)d-;{gEw*c9o?Opw+@0U61=6iBMDfw9!EUj{uycf@;{_jlumA7q=xr8nBIuZ z;47HEiOtbotVs3QsqIIO_hR*6Zwn)$^gJ&;uYG^paX{#k-^`E=gt*k08i{Mp' + (item.name || item.route_path) + ''; + }).join(''); + } + document.querySelectorAll('#adminTabs .tab').forEach(function (tab) { + tab.onclick = function () { + activateAdminTab(tab.dataset.tab); + }; + }); + var fallbackTab = activeAdminTabName && knownItems.some(function (item) { return item.route_path === activeAdminTabName; }) + ? activeAdminTabName + : knownItems[0].route_path; + activateAdminTab(fallbackTab); + } + function loadAdminMenus(preferredTab) { + if (preferredTab) activeAdminTabName = preferredTab; + fetch('/api/admin/current-user/menus') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + if (adminTabsEl) adminTabsEl.innerHTML = '

菜单加载失败
'; + hideAllAdminPanels(); + return; + } + renderAdminTabs(res.items || []); + }) + .catch(function () { + if (adminTabsEl) adminTabsEl.innerHTML = '
菜单加载失败
'; + hideAllAdminPanels(); + }); + } + hideAllAdminPanels(); + + // ========== 用户管理 ========== + var userPage = 1, userPageSize = 15; + var currentUserId = null; + var currentUserRole = 'admin'; + var currentUserUsername = ''; + var adminsList = []; + function roleLabel(role) { + if (role === 'super_admin') return '超级管理员'; + if (role === 'admin') return '管理员'; + return '普通账号'; + } + function buildUserListQuery(page) { + var q = 'page=' + (page || 1) + '&page_size=' + userPageSize; + var kw = (document.getElementById('searchUsername').value || '').trim(); + if (kw) q += '&username=' + encodeURIComponent(kw); + var cby = document.getElementById('filterCreatedBy').value; + if (cby) q += '&created_by_id=' + encodeURIComponent(cby); + return q; + } + function loadUsers(page) { + userPage = page || 1; + fetch('/api/admin/users?' + buildUserListQuery(userPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('userListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + currentUserId = res.current_user_id || null; + currentUserRole = res.current_user_role || 'admin'; + currentUserUsername = (res.current_user_username || '').trim(); + adminsList = res.admins || []; + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无用户'; + } else { + tbody.innerHTML = items.map(function (u) { + return '' + u.id + '' + (u.username || '') + '' + + roleLabel(u.role || 'normal') + '' + (u.creator_username || '-') + '' + (u.created_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('userPagination', res.total, res.page, res.page_size, loadUsers); + bindUserActions(); + updateCreateFormByRole(); + updateUserFilterByRole(); + }) + .catch(function () { + document.getElementById('userListBody').innerHTML = '请求失败'; + }); + } + function updateUserFilterByRole() { + var grp = document.getElementById('filterCreatedByGroup'); + var sel = document.getElementById('filterCreatedBy'); + if (currentUserRole === 'super_admin') { + grp.style.display = 'block'; + var cur = sel.value; + sel.innerHTML = ''; + adminsList.forEach(function (a) { + var opt = document.createElement('option'); + opt.value = a.id; + opt.textContent = a.username; + sel.appendChild(opt); + }); + sel.value = cur || ''; + } else { + grp.style.display = 'none'; + } + } + + function updateDedupeTotalDataAccess() { + var tab = document.querySelector('.tab[data-tab="dedupe-total-data"]'); + var panel = document.getElementById('panel-dedupe-total-data'); + var canUse = currentUserRole === 'super_admin' || (currentUserRole === 'admin' && currentUserUsername === ''); + if (tab) tab.style.display = canUse ? '' : 'none'; + if (panel) panel.style.display = canUse ? '' : 'none'; + if (!canUse && tab && tab.classList.contains('active')) { + tab.classList.remove('active'); + if (panel) panel.classList.remove('active'); + var usersTab = document.querySelector('.tab[data-tab="users"]'); + var usersPanel = document.getElementById('panel-users'); + if (usersTab) usersTab.classList.add('active'); + if (usersPanel) usersPanel.classList.add('active'); + } + } + function updateShopManageAccess() { + var tab = document.querySelector('.tab[data-tab="shop-manage"]'); + var panel = document.getElementById('panel-shop-manage'); + if (!tab || !panel) return; + var canUse = currentUserRole === 'super_admin' || + !!currentUserAdminPermissionKeys['admin_shop_manage'] || + !!currentUserAdminPermissionRoutes['shop-manage']; + tab.style.display = canUse ? '' : 'none'; + panel.style.display = canUse ? '' : 'none'; + if (!canUse && tab.classList.contains('active')) { + tab.classList.remove('active'); + panel.classList.remove('active'); + var usersTab = document.querySelector('.tab[data-tab="users"]'); + var usersPanel = document.getElementById('panel-users'); + if (usersTab) usersTab.classList.add('active'); + if (usersPanel) usersPanel.classList.add('active'); + } + } + function loadCurrentUserAdminPermissions() { + currentUserAdminPermissionKeys = {}; + currentUserAdminPermissionRoutes = {}; + if (!currentUserId || currentUserRole === 'super_admin') { + updateShopManageAccess(); + return; + } + fetch('/api/admin/user/' + currentUserId + '/column-permissions?menu_type=admin') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + updateShopManageAccess(); + return; + } + (res.items || []).forEach(function (item) { + var columnKey = (item.column_key || '').trim(); + var routePath = (item.route_path || '').trim(); + if (columnKey) currentUserAdminPermissionKeys[columnKey] = true; + if (routePath) currentUserAdminPermissionRoutes[routePath] = true; + }); + updateShopManageAccess(); + }) + .catch(function () { + updateShopManageAccess(); + }); + } + function applyTabAccess(tabName, canUse) { + var tab = document.querySelector('.tab[data-tab="' + tabName + '"]'); + var panel = document.getElementById('panel-' + tabName); + if (tab) tab.style.display = canUse ? '' : 'none'; + if (panel) panel.style.display = canUse ? '' : 'none'; + if (!canUse && tab && tab.classList.contains('active')) { + tab.classList.remove('active'); + if (panel) panel.classList.remove('active'); + var usersTab = document.querySelector('.tab[data-tab="users"]'); + var usersPanel = document.getElementById('panel-users'); + if (usersTab) usersTab.classList.add('active'); + if (usersPanel) usersPanel.classList.add('active'); + } + } + function hasAdminTabAccess(tabName) { + var config = ADMIN_TAB_ACCESS_CONFIG[tabName]; + if (!config) return true; + if (currentUserRole === 'super_admin') return true; + if (config.superAdminOnly) return false; + return !!currentUserAdminPermissionKeys[config.columnKey] || + !!currentUserAdminPermissionRoutes[config.routePath]; + } + function refreshAdminTabAccess() { + Object.keys(ADMIN_TAB_ACCESS_CONFIG).forEach(function (tabName) { + applyTabAccess(tabName, hasAdminTabAccess(tabName)); + }); + } + function loadCurrentUserAdminPermissions() { + currentUserAdminPermissionKeys = {}; + currentUserAdminPermissionRoutes = {}; + if (!currentUserId || currentUserRole === 'super_admin') { + refreshAdminTabAccess(); + return; + } + fetch('/api/admin/user/' + currentUserId + '/column-permissions?menu_type=admin') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + refreshAdminTabAccess(); + return; + } + (res.items || []).forEach(function (item) { + var columnKey = (item.column_key || '').trim(); + var routePath = (item.route_path || '').trim(); + if (columnKey) currentUserAdminPermissionKeys[columnKey] = true; + if (routePath) currentUserAdminPermissionRoutes[routePath] = true; + }); + refreshAdminTabAccess(); + }) + .catch(function () { + refreshAdminTabAccess(); + }); + } + var allColumnsList = []; + function loadColumnsForPermission() { + fetch('/api/admin/columns?menu_type=admin') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) return; + allColumnsList = res.items || []; + renderColumnPermissionWrap('createColumnPermissionWrap'); + renderColumnPermissionWrap('editColumnPermissionWrap'); + var selCreate = document.getElementById('createColumnPermissionWrap'); + var selEdit = document.getElementById('editColumnPermissionWrap'); + if (selCreate && !selCreate._colCardsBound) { + selCreate._colCardsBound = true; + selCreate.onchange = function () { renderColumnCards('createColumnPermissionWrap'); }; + } + if (selEdit && !selEdit._colCardsBound) { + selEdit._colCardsBound = true; + selEdit.onchange = function () { renderColumnCards('editColumnPermissionWrap'); }; + } + }) + .catch(function () { }); + } + var columnCardsContainerMap = { createColumnPermissionWrap: 'createColumnCards', editColumnPermissionWrap: 'editColumnCards' }; + function renderColumnCards(selectId) { + var sel = document.getElementById(selectId); + var cardsId = columnCardsContainerMap[selectId]; + var cardsEl = cardsId ? document.getElementById(cardsId) : null; + if (!sel || sel.tagName !== 'SELECT' || !cardsEl) return; + cardsEl.innerHTML = ''; + for (var i = 0; i < sel.options.length; i++) { + var opt = sel.options[i]; + if (opt.disabled || !opt.selected) continue; + var card = document.createElement('span'); + card.className = 'column-permission-card'; + card.textContent = opt.textContent; + var btn = document.createElement('button'); + btn.type = 'button'; + btn.className = 'col-card-remove'; + btn.setAttribute('aria-label', '移除'); + btn.textContent = '×'; + (function (option, seldId) { + btn.onclick = function () { + option.selected = false; + renderColumnCards(seldId); + }; + })(opt, selectId); + card.appendChild(btn); + cardsEl.appendChild(card); + } + } + function renderColumnPermissionWrap(wrapId) { + var sel = document.getElementById(wrapId); + if (!sel || sel.tagName !== 'SELECT') return; + sel.innerHTML = ''; + allColumnsList.forEach(function (c) { + var opt = document.createElement('option'); + opt.value = c.id; + opt.textContent = c.name + ' (' + c.column_key + ')'; + sel.appendChild(opt); + }); + if (allColumnsList.length === 0) { + var opt = document.createElement('option'); + opt.disabled = true; + opt.textContent = '暂无菜单，请先在“栏目权限配置”中新增菜单'; + sel.appendChild(opt); + } + renderColumnCards(wrapId); + } + function getSelectedColumnIds(wrapId) { + var sel = document.getElementById(wrapId); + if (!sel || sel.tagName !== 'SELECT') return []; + var ids = []; + for (var i = 0; i < sel.options.length; i++) { + if (sel.options[i].selected) { + var v = parseInt(sel.options[i].value, 10); + if (!isNaN(v)) ids.push(v); + } + } + return ids; + } + function setColumnPermissionCheckboxes(wrapId, columnIds) { + var sel = document.getElementById(wrapId); + if (!sel || sel.tagName !== 'SELECT') return; + var set = {}; + (columnIds || []).forEach(function (id) { set[id] = true; }); + for (var i = 0; i < sel.options.length; i++) { + var opt = sel.options[i]; + if (opt.disabled) continue; + opt.selected = set[parseInt(opt.value, 10)] || false; + } + renderColumnCards(wrapId); + } + function updateCreateFormByRole() { + var roleSel = document.getElementById('createRole'); + var optAdmin = document.getElementById('optAdmin'); + var formCreatedBy = document.getElementById('formGroupCreatedBy'); + var selCreatedBy = document.getElementById('createCreatedBy'); + if (currentUserRole === 'super_admin') { + if (optAdmin) optAdmin.style.display = ''; + formCreatedBy.style.display = (roleSel.value === 'normal') ? 'block' : 'none'; + selCreatedBy.innerHTML = ''; + adminsList.forEach(function (a) { + var opt = document.createElement('option'); + opt.value = a.id; + opt.textContent = a.username; + selCreatedBy.appendChild(opt); + }); + } else { + if (optAdmin) optAdmin.style.display = 'none'; + roleSel.value = 'normal'; + formCreatedBy.style.display = 'none'; + } + } + function bindUserActions() { + document.querySelectorAll('[data-edit]').forEach(function (btn) { + btn.onclick = function () { + var raw = (btn.getAttribute('data-user') || '{}').replace(/"/g, '"'); + var u; + try { u = JSON.parse(raw); } catch (e) { u = {}; } + document.getElementById('editUserId').value = u.id || ''; + document.getElementById('editUsername').value = u.username || ''; + document.getElementById('editPassword').value = ''; + var editRole = document.getElementById('editRole'); + var editFormGroupRole = document.getElementById('editFormGroupRole'); + var editFormGroupCreator = document.getElementById('editFormGroupCreator'); + var editCreatorName = document.getElementById('editCreatorName'); + editFormGroupRole.style.display = (currentUserRole === 'super_admin' && u.role !== 'super_admin') ? 'block' : 'none'; + editFormGroupCreator.style.display = (u.role === 'normal' && u.creator_username) ? 'block' : 'none'; + editCreatorName.value = u.creator_username || ''; + if (u.role !== 'super_admin') { editRole.value = u.role || 'normal'; } + document.getElementById('msgEdit').textContent = ''; + if (allColumnsList.length) { + renderColumnPermissionWrap('editColumnPermissionWrap'); + fetch('/api/admin/user/' + (u.id) + '/columns') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success && res.column_ids) setColumnPermissionCheckboxes('editColumnPermissionWrap', res.column_ids); + }); + } + document.getElementById('editUserModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-delete]').forEach(function (btn) { + btn.onclick = function () { + if (!confirm('确定删除用户 "' + (btn.dataset.name || '') + '" 吗？')) return; + fetch('/api/admin/user/' + btn.dataset.delete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadUsers(userPage); } + else { alert(res.error || '删除失败'); } + }); + }; + }); + } + + document.getElementById('btnSearchUsers').onclick = function () { loadUsers(1); }; + document.getElementById('createRole').onchange = function () { updateCreateFormByRole(); }; + document.getElementById('btnCreate').onclick = function () { + var username = (document.getElementById('username').value || '').trim(); + var password = document.getElementById('password').value || ''; + var role = document.getElementById('createRole').value || 'normal'; + var createdById = document.getElementById('createCreatedBy').value ? parseInt(document.getElementById('createCreatedBy').value, 10) : null; + var msgEl = document.getElementById('msgCreate'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!username || username.length < 2) { + msgEl.textContent = '用户名至少 2 个字符'; + msgEl.classList.add('err'); + return; + } + if (!password || password.length < 6) { + msgEl.textContent = '密码至少 6 个字符'; + msgEl.classList.add('err'); + return; + } + var body = { username: username, password: password, role: role }; + if (role === 'normal' && currentUserRole === 'super_admin' && createdById) body.created_by_id = createdById; + body.column_ids = getSelectedColumnIds('createColumnPermissionWrap'); + fetch('/api/admin/user', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = res.msg || '创建成功'; + msgEl.classList.add('ok'); + document.getElementById('username').value = ''; + document.getElementById('password').value = ''; + loadUsers(1); + } else { + msgEl.textContent = res.error || '创建失败'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.classList.add('err'); + }); + }; + + document.getElementById('btnSaveUser').onclick = function () { + var uid = document.getElementById('editUserId').value; + var password = document.getElementById('editPassword').value; + var editRoleEl = document.getElementById('editRole'); + var msgEl = document.getElementById('msgEdit'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + var body = {}; + if (password) body.password = password; + if (currentUserRole === 'super_admin' && editRoleEl && editRoleEl.offsetParent !== null) + body.role = editRoleEl.value || 'normal'; + body.column_ids = getSelectedColumnIds('editColumnPermissionWrap'); + fetch('/api/admin/user/' + uid, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = res.msg || '保存成功'; + msgEl.classList.add('ok'); + document.getElementById('editUserModal').classList.remove('show'); + loadUsers(userPage); + if (String(uid || '') === String(currentUserId || '')) { + loadAdminMenus(getActiveAdminTabName()); + } + } else { + msgEl.textContent = res.error || '保存失败'; + msgEl.classList.add('err'); + } + }); + }; + document.getElementById('btnCloseEdit').onclick = function () { + document.getElementById('editUserModal').classList.remove('show'); + }; + + // ========== 生成记录 ========== + var historyPage = 1, historyPageSize = 15; + function toSqlDatetime(val) { + if (!val) return ''; + return val.replace('T', ' '); + } + function buildHistoryQuery(page) { + var q = 'page=' + (page || 1) + '&page_size=' + historyPageSize; + var uid = document.getElementById('filterUser').value; + var start = toSqlDatetime(document.getElementById('filterTimeStart').value); + var end = toSqlDatetime(document.getElementById('filterTimeEnd').value); + if (uid) q += '&user_id=' + uid; + if (start) q += '&time_start=' + encodeURIComponent(start); + if (end) q += '&time_end=' + encodeURIComponent(end); + return q; + } + function loadHistory(page) { + historyPage = page || 1; + fetch('/api/admin/history?' + buildHistoryQuery(historyPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('historyListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无记录'; + } else { + tbody.innerHTML = items.map(function (h) { + var urls = (h.result_urls || []); + var thumbUrls = (h.long_image_url ? [h.long_image_url] : []).concat(urls); + var thumbs = thumbUrls.slice(0, 3).map(function (url) { + return ''; + }).join(''); + return '' + h.id + '' + (h.username || '-') + '' + + (h.panel_type || '-') + '' + (h.created_at || '') + '' + + '
' + (thumbs || '-') + '
'; + }).join(''); + } + renderPagination('historyPagination', res.total, res.page, res.page_size, loadHistory); + }) + .catch(function () { + document.getElementById('historyListBody').innerHTML = '请求失败'; + }); + } + function loadUserOptions() { + fetch('/api/admin/users?page=1&page_size=999') + .then(function (r) { return r.json(); }) + .then(function (res) { + var sel = document.getElementById('filterUser'); + var cur = sel.value; + sel.innerHTML = ''; + (res.items || []).forEach(function (u) { + var opt = document.createElement('option'); + opt.value = u.id; + opt.textContent = u.username + ' (' + roleLabel(u.role || 'normal') + ')'; + sel.appendChild(opt); + }); + sel.value = cur || ''; + }); + } + var shopManageGroupUsers = []; + function refreshShopManageGroupUserSelect(selectedUserId) { + var sel = document.getElementById('shopManageGroupUserSelect'); + if (!sel) return; + var opts = ['']; + shopManageGroupUsers.forEach(function (u) { + opts.push(''); + }); + sel.innerHTML = opts.join(''); + if (selectedUserId != null && selectedUserId !== '') { + sel.value = String(selectedUserId); + } + syncShopManageGroupNameWithUser(); + } + function syncShopManageGroupNameWithUser() { + var sel = document.getElementById('shopManageGroupUserSelect'); + var input = document.getElementById('shopManageGroupInput'); + if (!sel || !input) return; + var selectedUser = null; + shopManageGroupUsers.some(function (u) { + if (String(u.id) === String(sel.value || '')) { + selectedUser = u; + return true; + } + return false; + }); + input.value = selectedUser ? (selectedUser.username || '') : ''; + } + function loadUserOptions() { + return fetch('/api/admin/users?page=1&page_size=999') + .then(function (r) { return r.json(); }) + .then(function (res) { + var items = res.items || []; + shopManageGroupUsers = items.map(function (u) { + return { id: u.id, username: u.username || '', role: u.role || 'normal' }; + }); + refreshShopManageGroupUserSelect(document.getElementById('shopManageGroupUserSelect') ? document.getElementById('shopManageGroupUserSelect').value : ''); + var sel = document.getElementById('filterUser'); + var cur = sel.value; + sel.innerHTML = ''; + items.forEach(function (u) { + var opt = document.createElement('option'); + opt.value = u.id; + opt.textContent = u.username + ' (' + roleLabel(u.role || 'normal') + ')'; + sel.appendChild(opt); + }); + sel.value = cur || ''; + }); + } + document.getElementById('btnFilterHistory').onclick = function () { loadHistory(1); }; + + // ========== 数据去重总数据 ========== + var dedupeTotalDataPage = 1, dedupeTotalDataPageSize = 15; + function buildDedupeTotalDataQuery(page) { + var q = 'page=' + (page || 1) + '&page_size=' + dedupeTotalDataPageSize; + var keyword = (document.getElementById('searchDedupeTotalData').value || '').trim(); + if (keyword) q += '&keyword=' + encodeURIComponent(keyword); + return q; + } + function loadDedupeTotalData(page) { + dedupeTotalDataPage = page || 1; + fetch('/api/admin/dedupe-total-data?' + buildDedupeTotalDataQuery(dedupeTotalDataPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('dedupeTotalDataListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无总数据'; + } else { + tbody.innerHTML = items.map(function (item) { + return '' + item.id + '' + (item.data_value || '') + '' + (item.created_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('dedupeTotalDataPagination', res.total, res.page, res.page_size, loadDedupeTotalData); + bindDedupeTotalDataActions(); + }) + .catch(function () { + document.getElementById('dedupeTotalDataListBody').innerHTML = '请求失败'; + }); + } + function bindDedupeTotalDataActions() { + document.querySelectorAll('[data-dedupe-total-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('editDedupeTotalDataId').value = btn.dataset.dedupeTotalEdit || ''; + document.getElementById('editDedupeTotalDataValue').value = (btn.dataset.value || '').replace(/"/g, '"'); + document.getElementById('msgEditDedupeTotalData').textContent = ''; + document.getElementById('msgEditDedupeTotalData').className = 'msg'; + document.getElementById('editDedupeTotalDataModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-dedupe-total-delete]').forEach(function (btn) { + btn.onclick = function () { + var value = (btn.dataset.value || '').replace(/"/g, '"'); + if (!confirm('确定删除总数据“' + value + '”吗？')) return; + fetch('/api/admin/dedupe-total-data/' + btn.dataset.dedupeTotalDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadDedupeTotalData(dedupeTotalDataPage); } + else { alert(res.error || '删除失败'); } + }); + }; + }); + } + document.getElementById('btnSearchDedupeTotalData').onclick = function () { loadDedupeTotalData(1); }; + var dedupeImportPollTimer = null; + var dedupeDeleteImportPollTimer = null; + function stopDedupeImportProgress() { + if (dedupeImportPollTimer) { + clearInterval(dedupeImportPollTimer); + dedupeImportPollTimer = null; + } + } + function stopDedupeDeleteImportProgress() { + if (dedupeDeleteImportPollTimer) { + clearInterval(dedupeDeleteImportPollTimer); + dedupeDeleteImportPollTimer = null; + } + } + function setDedupeImportProgress(percent, text) { + var wrap = document.getElementById('dedupeTotalDataProgressWrap'); + var fill = document.getElementById('dedupeTotalDataProgressFill'); + var textEl = document.getElementById('dedupeTotalDataProgressText'); + wrap.style.display = 'block'; + fill.style.width = Math.max(0, Math.min(100, percent || 0)) + '%'; + textEl.textContent = text || ''; + } + function setDedupeDeleteImportProgress(percent, text) { + var wrap = document.getElementById('dedupeTotalDataDeleteProgressWrap'); + var fill = document.getElementById('dedupeTotalDataDeleteProgressFill'); + var textEl = document.getElementById('dedupeTotalDataDeleteProgressText'); + wrap.style.display = 'block'; + fill.style.width = Math.max(0, Math.min(100, percent || 0)) + '%'; + textEl.textContent = text || ''; + } + function pollDedupeImport(importId) { + stopDedupeImportProgress(); + function tick() { + fetch('/api/admin/dedupe-total-data/import/' + encodeURIComponent(importId)) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = res.error || '查询导入进度失败'; + document.getElementById('msgDedupeTotalData').className = 'msg err'; + return; + } + var progress = res.progress || {}; + var totalRows = progress.total_rows || 0; + var processedRows = progress.processed_rows || 0; + var percent = totalRows > 0 ? Math.round(processedRows * 100 / totalRows) : 0; + setDedupeImportProgress(percent, '处理中：已处理 ' + processedRows + ' / ' + totalRows + '，新增 ' + (progress.inserted_count || 0) + '，跳过 ' + (progress.skipped_count || 0)); + if (progress.status === 'success') { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = '导入成功：总行数 ' + (progress.total_rows || 0) + '，ASIN 数量 ' + (progress.asin_count || 0) + '，新增 ' + (progress.inserted_count || 0) + '，跳过 ' + (progress.skipped_count || 0); + document.getElementById('msgDedupeTotalData').className = 'msg ok'; + loadDedupeTotalData(1); + } else if (progress.status === 'failed') { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = progress.error_message || '导入失败'; + document.getElementById('msgDedupeTotalData').className = 'msg err'; + } + }) + .catch(function () { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = '查询导入进度失败'; + document.getElementById('msgDedupeTotalData').className = 'msg err'; + }); + } + tick(); + dedupeImportPollTimer = setInterval(tick, 1000); + } + function pollDedupeDeleteImport(importId) { + stopDedupeDeleteImportProgress(); + function tick() { + fetch('/api/admin/dedupe-total-data/delete-import/' + encodeURIComponent(importId)) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = res.error || '查询删除进度失败'; + document.getElementById('msgDeleteDedupeTotalData').className = 'msg err'; + return; + } + var progress = res.progress || {}; + var totalRows = progress.total_rows || 0; + var processedRows = progress.processed_rows || 0; + var percent = totalRows > 0 ? Math.round(processedRows * 100 / totalRows) : 0; + setDedupeDeleteImportProgress(percent, '处理中：已处理 ' + processedRows + ' / ' + totalRows + '，删除 ' + (progress.deleted_count || 0) + '，跳过 ' + (progress.skipped_count || 0)); + if (progress.status === 'success') { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = '删除成功：总行数 ' + (progress.total_rows || 0) + '，ASIN 数量 ' + (progress.asin_count || 0) + '，删除 ' + (progress.deleted_count || 0) + '，跳过 ' + (progress.skipped_count || 0); + document.getElementById('msgDeleteDedupeTotalData').className = 'msg ok'; + loadDedupeTotalData(1); + } else if (progress.status === 'failed') { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = progress.error_message || '删除失败'; + document.getElementById('msgDeleteDedupeTotalData').className = 'msg err'; + } + }) + .catch(function () { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = '查询删除进度失败'; + document.getElementById('msgDeleteDedupeTotalData').className = 'msg err'; + }); + } + tick(); + dedupeDeleteImportPollTimer = setInterval(tick, 1000); + } + + document.getElementById('btnAddDedupeTotalData').onclick = function () { + var fileInput = document.getElementById('dedupeTotalDataFile'); + var msgEl = document.getElementById('msgDedupeTotalData'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + stopDedupeImportProgress(); + document.getElementById('dedupeTotalDataProgressWrap').style.display = 'none'; + if (!fileInput.files || fileInput.files.length === 0) { + msgEl.textContent = '请选择 Excel 文件'; + msgEl.classList.add('err'); + return; + } + var file = fileInput.files[0]; + var lowerName = (file.name || '').toLowerCase(); + if (!(lowerName.endsWith('.xlsx') || lowerName.endsWith('.xls'))) { + msgEl.textContent = '仅支持 .xlsx 或 .xls 文件'; + msgEl.classList.add('err'); + return; + } + var formData = new FormData(); + formData.append('file', file); + var xhr = new XMLHttpRequest(); + xhr.open('POST', '/api/admin/dedupe-total-data/import', true); + xhr.upload.onprogress = function (event) { + if (event.lengthComputable) { + var percent = Math.round(event.loaded * 100 / event.total); + setDedupeImportProgress(percent, '上传中：' + percent + '%'); + } + }; + xhr.onreadystatechange = function () { + if (xhr.readyState !== 4) return; + if (xhr.status < 200 || xhr.status >= 300) { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + return; + } + var res; + try { res = JSON.parse(xhr.responseText || '{}'); } catch (e) { res = { success: false, error: '返回格式错误' }; } + if (!res.success) { + msgEl.textContent = res.error || '导入失败'; + msgEl.className = 'msg err'; + return; + } + setDedupeImportProgress(100, '上传完成，后端处理中...'); + pollDedupeImport(res.import_id); + fileInput.value = ''; + }; + xhr.onerror = function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }; + xhr.send(formData); + }; + document.getElementById('btnDeleteImportDedupeTotalData').onclick = function () { + var fileInput = document.getElementById('dedupeTotalDataDeleteFile'); + var msgEl = document.getElementById('msgDeleteDedupeTotalData'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + stopDedupeDeleteImportProgress(); + document.getElementById('dedupeTotalDataDeleteProgressWrap').style.display = 'none'; + if (!fileInput.files || fileInput.files.length === 0) { + msgEl.textContent = '请选择 Excel 文件'; + msgEl.classList.add('err'); + return; + } + var file = fileInput.files[0]; + var lowerName = (file.name || '').toLowerCase(); + if (!(lowerName.endsWith('.xlsx') || lowerName.endsWith('.xls'))) { + msgEl.textContent = '仅支持 .xlsx 或 .xls 文件'; + msgEl.classList.add('err'); + return; + } + if (!confirm('确定按 Excel 中的 ASIN 批量删除匹配的总数据吗？')) { + return; + } + var formData = new FormData(); + formData.append('file', file); + var xhr = new XMLHttpRequest(); + xhr.open('POST', '/api/admin/dedupe-total-data/delete-import', true); + xhr.upload.onprogress = function (event) { + if (event.lengthComputable) { + var percent = Math.round(event.loaded * 100 / event.total); + setDedupeDeleteImportProgress(percent, '上传中：' + percent + '%'); + } + }; + xhr.onreadystatechange = function () { + if (xhr.readyState !== 4) return; + if (xhr.status < 200 || xhr.status >= 300) { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + return; + } + var res; + try { res = JSON.parse(xhr.responseText || '{}'); } catch (e) { res = { success: false, error: '返回格式错误' }; } + if (!res.success) { + msgEl.textContent = res.error || '删除失败'; + msgEl.className = 'msg err'; + return; + } + setDedupeDeleteImportProgress(100, '上传完成，后端处理中...'); + pollDedupeDeleteImport(res.import_id); + fileInput.value = ''; + }; + xhr.onerror = function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }; + xhr.send(formData); + }; + document.getElementById('btnSaveDedupeTotalData').onclick = function () { + var itemId = document.getElementById('editDedupeTotalDataId').value; + var value = (document.getElementById('editDedupeTotalDataValue').value || '').trim(); + var msgEl = document.getElementById('msgEditDedupeTotalData'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!value) { + msgEl.textContent = '请填写总数据值'; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/dedupe-total-data/' + itemId, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ data_value: value }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editDedupeTotalDataModal').classList.remove('show'); + loadDedupeTotalData(dedupeTotalDataPage); + } else { + msgEl.textContent = res.error || '保存失败'; + msgEl.classList.add('err'); + } + }); + }; + document.getElementById('btnCloseEditDedupeTotalData').onclick = function () { + document.getElementById('editDedupeTotalDataModal').classList.remove('show'); + }; + + // ========== 店铺密钥管理 ========== + var shopKeyPage = 1, shopKeyPageSize = 15; + function buildShopKeyQuery(page) { + return 'page=' + (page || 1) + '&page_size=' + shopKeyPageSize; + } + function loadShopKeys(page) { + shopKeyPage = page || 1; + fetch('/api/admin/shop-keys?' + buildShopKeyQuery(shopKeyPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('shopKeyListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无店铺密钥'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (shopKeyPage - 1) * shopKeyPageSize + index + 1; + return '' + rowNo + '' + (item.ziniao_account_name || '') + '' + (item.ziniao_token || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('shopKeyPagination', res.total, res.page, res.page_size, loadShopKeys); + bindShopKeyActions(); + }) + .catch(function () { + document.getElementById('shopKeyListBody').innerHTML = '请求失败'; + }); + } + function bindShopKeyActions() { + document.querySelectorAll('[data-shop-key-edit]').forEach(function (btn) { + btn.onclick = function () { + var item = {}; + try { item = JSON.parse((btn.dataset.shopKey || '').replace(/"/g, '"')); } catch (e) { item = {}; } + document.getElementById('editShopKeyId').value = item.id || ''; + document.getElementById('editShopKeyZiniaoAccountName').value = item.ziniao_account_name || ''; + document.getElementById('editShopKeyZiniaoToken').value = item.ziniao_token || ''; + document.getElementById('msgEditShopKey').textContent = ''; + document.getElementById('msgEditShopKey').className = 'msg'; + document.getElementById('editShopKeyModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-shop-key-delete]').forEach(function (btn) { + btn.onclick = function () { + var name = (btn.dataset.ziniaoAccountName || '').replace(/"/g, '"'); + if (!confirm('确定删除店铺密钥“' + name + '”吗？')) return; + fetch('/api/admin/shop-key/' + btn.dataset.shopKeyDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadShopKeys(shopKeyPage); } + else { alert(res.error || '删除失败'); } + }); + }; + }); + } + document.getElementById('btnCreateShopKey').onclick = function () { + var ziniaoAccountName = (document.getElementById('shopKeyZiniaoAccountName').value || '').trim(); + var ziniaoToken = (document.getElementById('shopKeyZiniaoToken').value || '').trim(); + var msgEl = document.getElementById('msgShopKey'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!ziniaoAccountName || !ziniaoToken) { + msgEl.textContent = '请完整填写紫鸟账号名称、紫鸟令牌'; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-key', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + ziniao_account_name: ziniaoAccountName, + ziniao_token: ziniaoToken + }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('shopKeyZiniaoAccountName').value = ''; + document.getElementById('shopKeyZiniaoToken').value = ''; + msgEl.textContent = res.msg || '创建成功'; + msgEl.className = 'msg ok'; + loadShopKeys(1); + } else { + msgEl.textContent = res.error || '创建失败'; + msgEl.className = 'msg err'; + } + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }); + }; + document.getElementById('btnSaveShopKey').onclick = function () { + var itemId = document.getElementById('editShopKeyId').value; + var ziniaoAccountName = (document.getElementById('editShopKeyZiniaoAccountName').value || '').trim(); + var ziniaoToken = (document.getElementById('editShopKeyZiniaoToken').value || '').trim(); + var msgEl = document.getElementById('msgEditShopKey'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!ziniaoAccountName || !ziniaoToken) { + msgEl.textContent = '请完整填写紫鸟账号名称、紫鸟令牌'; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-key/' + itemId, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + ziniao_account_name: ziniaoAccountName, + ziniao_token: ziniaoToken + }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editShopKeyModal').classList.remove('show'); + loadShopKeys(shopKeyPage); + } else { + msgEl.textContent = res.error || '保存失败'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.classList.add('err'); + }); + }; + document.getElementById('btnCloseEditShopKey').onclick = function () { + document.getElementById('editShopKeyModal').classList.remove('show'); + }; + + // ========== 店铺管理 ========== + var shopManagePage = 1, shopManagePageSize = 15; + var shopManageGroups = []; + + function buildShopManageQuery(page) { + var query = 'page=' + (page || 1) + '&page_size=' + shopManagePageSize; + var groupId = (document.getElementById('shopManageFilterGroupId').value || '').trim(); + var shopName = (document.getElementById('shopManageFilterShopName').value || '').trim(); + if (groupId) query += '&group_id=' + encodeURIComponent(groupId); + if (shopName) query += '&shop_name=' + encodeURIComponent(shopName); + return query; + } + + function refreshShopGroupSelects(selectedCreateId, selectedEditId) { + var createSel = document.getElementById('shopManageGroupSelect'); + var editSel = document.getElementById('editShopManageGroupSelect'); + var filterSel = document.getElementById('shopManageFilterGroupId'); + var skipCreateSel = document.getElementById('skipPriceAsinGroupSelect'); + var skipFilterSel = document.getElementById('skipPriceAsinFilterGroupId'); + var chooseSkipShopSel = document.getElementById('chooseSkipPriceAsinShopGroupId'); + var selectedFilterId = filterSel ? filterSel.value : ''; + var selectedSkipCreateId = skipCreateSel ? skipCreateSel.value : ''; + var selectedSkipFilterId = skipFilterSel ? skipFilterSel.value : ''; + var selectedChooseSkipShopId = chooseSkipShopSel ? chooseSkipShopSel.value : ''; + var createOpts = ['']; + var filterOpts = ['']; + shopManageGroups.forEach(function (g) { + var option = ''; + createOpts.push(option); + filterOpts.push(option); + }); + createSel.innerHTML = createOpts.join(''); + editSel.innerHTML = createOpts.join(''); + if (skipCreateSel) skipCreateSel.innerHTML = createOpts.join(''); + if (filterSel) filterSel.innerHTML = filterOpts.join(''); + if (skipFilterSel) skipFilterSel.innerHTML = filterOpts.join(''); + if (chooseSkipShopSel) chooseSkipShopSel.innerHTML = filterOpts.join(''); + if (selectedCreateId != null) createSel.value = String(selectedCreateId); + if (selectedEditId != null) editSel.value = String(selectedEditId); + if (filterSel && selectedFilterId) filterSel.value = selectedFilterId; + if (skipCreateSel && selectedSkipCreateId) skipCreateSel.value = selectedSkipCreateId; + if (skipFilterSel && selectedSkipFilterId) skipFilterSel.value = selectedSkipFilterId; + if (chooseSkipShopSel && selectedChooseSkipShopId) chooseSkipShopSel.value = selectedChooseSkipShopId; + } + + function loadShopManageGroups(selectedCreateId, selectedEditId) { + return fetch('/api/admin/shop-manage-groups') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) throw new Error(res.error || '加载分组失败'); + shopManageGroups = res.items || []; + refreshShopGroupSelects(selectedCreateId, selectedEditId); + return shopManageGroups; + }) + .catch(function () { + shopManageGroups = []; + refreshShopGroupSelects(); + return []; + }); + } + + function openShopManageGroupModal() { + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + document.getElementById('msgShopManageGroup').textContent = ''; + document.getElementById('msgShopManageGroup').className = 'msg'; + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + document.getElementById('shopManageGroupModal').classList.add('show'); + }); + } + + function renderShopManageGroupRows() { + var tbody = document.getElementById('shopManageGroupListBody'); + if (!shopManageGroups.length) { + tbody.innerHTML = '暂无分组'; + return; + } + tbody.innerHTML = shopManageGroups.map(function (item, index) { + return '' + (index + 1) + '' + (item.group_name || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + + document.querySelectorAll('[data-shop-group-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('shopManageGroupEditId').value = btn.dataset.shopGroupEdit; + document.getElementById('shopManageGroupInput').value = (btn.dataset.shopGroupName || '').replace(/"/g, '"'); + }; + }); + + document.querySelectorAll('[data-shop-group-delete]').forEach(function (btn) { + btn.onclick = function () { + var gid = btn.dataset.shopGroupDelete; + var gname = (btn.dataset.shopGroupName || '').replace(/"/g, '"'); + if (!confirm('确定删除分组“' + gname + '”吗？')) return; + fetch('/api/admin/shop-manage-group/' + gid, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + alert(res.error || '删除失败'); + return; + } + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }); + }; + }); + } + + function loadShopManage(page) { + shopManagePage = page || 1; + fetch('/api/admin/shop-manages?' + buildShopManageQuery(shopManagePage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('shopManageListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无店铺'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (shopManagePage - 1) * shopManagePageSize + index + 1; + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + (item.mall_name || '') + '' + (item.account || '') + '' + (item.password || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('shopManagePagination', res.total, res.page, res.page_size, loadShopManage); + bindShopManageActions(); + }) + .catch(function () { + document.getElementById('shopManageListBody').innerHTML = '请求失败'; + }); + } + + function bindShopManageActions() { + document.querySelectorAll('[data-shop-manage-edit]').forEach(function (btn) { + btn.onclick = function () { + var item = {}; + try { item = JSON.parse((btn.dataset.shopManage || '').replace(/"/g, '"')); } catch (e) { item = {}; } + document.getElementById('editShopManageId').value = item.id || ''; + document.getElementById('editShopManageShopName').value = item.shop_name || ''; + document.getElementById('editShopManageMallName').value = item.mall_name || ''; + document.getElementById('editShopManageAccount').value = item.account || ''; + document.getElementById('editShopManagePassword').value = item.password || ''; + document.getElementById('msgEditShopManage').textContent = ''; + document.getElementById('msgEditShopManage').className = 'msg'; + loadShopManageGroups(null, item.group_id).then(function () { + document.getElementById('editShopManageModal').classList.add('show'); + }); + }; + }); + document.querySelectorAll('[data-shop-manage-delete]').forEach(function (btn) { + btn.onclick = function () { + var name = (btn.dataset.shopManageName || '').replace(/"/g, '"'); + if (!confirm('确定删除店铺“' + name + '”吗？')) return; + fetch('/api/admin/shop-manage/' + btn.dataset.shopManageDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadShopManage(shopManagePage); } + else { alert(res.error || '删除失败'); } + }); + }; + }); + } + + document.getElementById('btnManageShopGroups').onclick = openShopManageGroupModal; + document.getElementById('btnManageShopGroupsFromEdit').onclick = openShopManageGroupModal; + document.getElementById('btnSearchShopManage').onclick = function () { + loadShopManage(1); + }; + document.getElementById('shopManageFilterShopName').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadShopManage(1); + } + }); + document.getElementById('btnCloseShopManageGroupModal').onclick = function () { + document.getElementById('shopManageGroupModal').classList.remove('show'); + }; + document.getElementById('btnCancelShopManageGroupEdit').onclick = function () { + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + }; + document.getElementById('btnSaveShopManageGroup').onclick = function () { + var editId = (document.getElementById('shopManageGroupEditId').value || '').trim(); + var groupName = (document.getElementById('shopManageGroupInput').value || '').trim(); + var msgEl = document.getElementById('msgShopManageGroup'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupName) { + msgEl.textContent = '请输入分组名称'; + msgEl.className = 'msg err'; + return; + } + var method = editId ? 'PUT' : 'POST'; + var url = editId ? ('/api/admin/shop-manage-group/' + editId) : '/api/admin/shop-manage-group'; + fetch(url, { + method: method, + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_name: groupName }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + msgEl.textContent = res.error || '保存失败'; + msgEl.className = 'msg err'; + return; + } + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + msgEl.textContent = res.msg || '保存成功'; + msgEl.className = 'msg ok'; + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }); + }; + + function refreshShopGroupSelects(selectedCreateId, selectedEditId) { + var createSel = document.getElementById('shopManageGroupSelect'); + var editSel = document.getElementById('editShopManageGroupSelect'); + var filterSel = document.getElementById('shopManageFilterGroupId'); + var skipCreateSel = document.getElementById('skipPriceAsinGroupSelect'); + var skipFilterSel = document.getElementById('skipPriceAsinFilterGroupId'); + var chooseSkipShopSel = document.getElementById('chooseSkipPriceAsinShopGroupId'); + var selectedFilterId = filterSel ? filterSel.value : ''; + var selectedSkipCreateId = skipCreateSel ? skipCreateSel.value : ''; + var selectedSkipFilterId = skipFilterSel ? skipFilterSel.value : ''; + var selectedChooseSkipShopId = chooseSkipShopSel ? chooseSkipShopSel.value : ''; + var createOpts = ['']; + var filterOpts = ['']; + shopManageGroups.forEach(function (g) { + var option = ''; + createOpts.push(option); + filterOpts.push(option); + }); + createSel.innerHTML = createOpts.join(''); + editSel.innerHTML = createOpts.join(''); + if (skipCreateSel) skipCreateSel.innerHTML = createOpts.join(''); + if (filterSel) filterSel.innerHTML = filterOpts.join(''); + if (skipFilterSel) skipFilterSel.innerHTML = filterOpts.join(''); + if (chooseSkipShopSel) chooseSkipShopSel.innerHTML = filterOpts.join(''); + if (selectedCreateId != null) createSel.value = String(selectedCreateId); + if (selectedEditId != null) editSel.value = String(selectedEditId); + if (filterSel && selectedFilterId) filterSel.value = selectedFilterId; + if (skipCreateSel && selectedSkipCreateId) skipCreateSel.value = selectedSkipCreateId; + if (skipFilterSel && selectedSkipFilterId) skipFilterSel.value = selectedSkipFilterId; + if (chooseSkipShopSel && selectedChooseSkipShopId) chooseSkipShopSel.value = selectedChooseSkipShopId; + } + + function loadShopManageGroups(selectedCreateId, selectedEditId) { + return fetch('/api/admin/shop-manage-groups') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) throw new Error(res.error || '加载分组失败'); + shopManageGroups = res.items || []; + refreshShopGroupSelects(selectedCreateId, selectedEditId); + return shopManageGroups; + }) + .catch(function () { + shopManageGroups = []; + refreshShopGroupSelects(); + return []; + }); + } + + function resetShopManageGroupForm() { + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + document.getElementById('msgShopManageGroup').textContent = ''; + document.getElementById('msgShopManageGroup').className = 'msg'; + refreshShopManageGroupUserSelect(''); + } + + function openShopManageGroupModal() { + resetShopManageGroupForm(); + loadUserOptions() + .then(function () { return loadShopManageGroups(); }) + .then(function () { + renderShopManageGroupRows(); + document.getElementById('shopManageGroupModal').classList.add('show'); + }); + } + + function renderShopManageGroupRows() { + var tbody = document.getElementById('shopManageGroupListBody'); + if (!shopManageGroups.length) { + tbody.innerHTML = '暂无分组'; + return; + } + tbody.innerHTML = shopManageGroups.map(function (item, index) { + return '' + (index + 1) + '' + (item.group_name || '') + '' + (item.username || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + + document.querySelectorAll('[data-shop-group-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('shopManageGroupEditId').value = btn.dataset.shopGroupEdit; + refreshShopManageGroupUserSelect(btn.dataset.shopGroupUserId || ''); + }; + }); + + document.querySelectorAll('[data-shop-group-delete]').forEach(function (btn) { + btn.onclick = function () { + var gid = btn.dataset.shopGroupDelete; + var gname = (btn.dataset.shopGroupName || '').replace(/"/g, '"'); + if (!confirm('确定删除分组“' + gname + '”吗？')) return; + fetch('/api/admin/shop-manage-group/' + gid, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + alert(res.error || '删除失败'); + return; + } + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }); + }; + }); + } + + document.getElementById('shopManageGroupUserSelect').onchange = syncShopManageGroupNameWithUser; + document.getElementById('btnManageShopGroups').onclick = openShopManageGroupModal; + document.getElementById('btnManageShopGroupsFromEdit').onclick = openShopManageGroupModal; + document.getElementById('btnManageSkipPriceAsinGroups').onclick = openShopManageGroupModal; + document.getElementById('btnCloseShopManageGroupModal').onclick = function () { + document.getElementById('shopManageGroupModal').classList.remove('show'); + }; + document.getElementById('btnCancelShopManageGroupEdit').onclick = resetShopManageGroupForm; + document.getElementById('btnSaveShopManageGroup').onclick = function () { + var editId = (document.getElementById('shopManageGroupEditId').value || '').trim(); + var groupName = (document.getElementById('shopManageGroupInput').value || '').trim(); + var userId = (document.getElementById('shopManageGroupUserSelect').value || '').trim(); + var msgEl = document.getElementById('msgShopManageGroup'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!userId || !groupName) { + msgEl.textContent = '请选择关联用户'; + msgEl.className = 'msg err'; + return; + } + var method = editId ? 'PUT' : 'POST'; + var url = editId ? ('/api/admin/shop-manage-group/' + editId) : '/api/admin/shop-manage-group'; + fetch(url, { + method: method, + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_name: groupName, user_id: Number(userId) }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + msgEl.textContent = res.error || '保存失败'; + msgEl.className = 'msg err'; + return; + } + resetShopManageGroupForm(); + msgEl.textContent = res.msg || '保存成功'; + msgEl.className = 'msg ok'; + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }); + }; + + document.getElementById('btnCreateShopManage').onclick = function () { + var groupId = (document.getElementById('shopManageGroupSelect').value || '').trim(); + var shopName = (document.getElementById('shopManageShopName').value || '').trim(); + var mallName = (document.getElementById('shopManageMallName').value || '').trim(); + var account = (document.getElementById('shopManageAccount').value || '').trim(); + var password = (document.getElementById('shopManagePassword').value || '').trim(); + var msgEl = document.getElementById('msgShopManage'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupId || !shopName || !mallName || !account || !password) { + msgEl.textContent = '请完整填写分组、店铺名、店铺商城名、账号、密码'; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-manage', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, mall_name: mallName, account: account, password: password }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('shopManageGroupSelect').value = ''; + document.getElementById('shopManageShopName').value = ''; + document.getElementById('shopManageMallName').value = ''; + document.getElementById('shopManageAccount').value = ''; + document.getElementById('shopManagePassword').value = ''; + msgEl.textContent = res.msg || '创建成功'; + msgEl.className = 'msg ok'; + loadShopManage(1); + } else { + msgEl.textContent = res.error || '创建失败'; + msgEl.className = 'msg err'; + } + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }); + }; + + document.getElementById('btnSaveShopManage').onclick = function () { + var itemId = document.getElementById('editShopManageId').value; + var groupId = (document.getElementById('editShopManageGroupSelect').value || '').trim(); + var shopName = (document.getElementById('editShopManageShopName').value || '').trim(); + var mallName = (document.getElementById('editShopManageMallName').value || '').trim(); + var account = (document.getElementById('editShopManageAccount').value || '').trim(); + var password = (document.getElementById('editShopManagePassword').value || '').trim(); + var msgEl = document.getElementById('msgEditShopManage'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupId || !shopName || !mallName || !account || !password) { + msgEl.textContent = '请完整填写分组、店铺名、店铺商城名、账号、密码'; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-manage/' + itemId, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, mall_name: mallName, account: account, password: password }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editShopManageModal').classList.remove('show'); + loadShopManage(shopManagePage); + } else { + msgEl.textContent = res.error || '保存失败'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.classList.add('err'); + }); + }; + document.getElementById('btnCloseEditShopManage').onclick = function () { + document.getElementById('editShopManageModal').classList.remove('show'); + }; + + // ========== 版本管理 ========== + // ========== 跳过跟价 ASIN ========== + var skipPriceAsinPage = 1, skipPriceAsinPageSize = 15; + var chooseSkipPriceAsinShopPage = 1, chooseSkipPriceAsinShopPageSize = 10; + var skipPriceCountryColumns = [ + { code: 'DE', field: 'asin_de', label: '德国' }, + { code: 'UK', field: 'asin_uk', label: '英国' }, + { code: 'FR', field: 'asin_fr', label: '法国' }, + { code: 'IT', field: 'asin_it', label: '意大利' }, + { code: 'ES', field: 'asin_es', label: '西班牙' } + ]; + function buildChooseSkipPriceAsinShopQuery(page) { + var query = 'page=' + (page || 1) + '&page_size=' + chooseSkipPriceAsinShopPageSize; + var groupId = (document.getElementById('chooseSkipPriceAsinShopGroupId').value || '').trim(); + var shopName = (document.getElementById('chooseSkipPriceAsinShopKeyword').value || '').trim(); + if (groupId) query += '&group_id=' + encodeURIComponent(groupId); + if (shopName) query += '&shop_name=' + encodeURIComponent(shopName); + return query; + } + function loadChooseSkipPriceAsinShops(page) { + chooseSkipPriceAsinShopPage = page || 1; + fetch('/api/admin/shop-manages?' + buildChooseSkipPriceAsinShopQuery(chooseSkipPriceAsinShopPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('chooseSkipPriceAsinShopListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (!items.length) { + tbody.innerHTML = '暂无店铺'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (chooseSkipPriceAsinShopPage - 1) * chooseSkipPriceAsinShopPageSize + index + 1; + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + (item.mall_name || '') + '' + (item.account || '') + '' + + '' + + ''; + }).join(''); + } + renderPagination('chooseSkipPriceAsinShopPagination', res.total, res.page, res.page_size, loadChooseSkipPriceAsinShops); + bindChooseSkipPriceAsinShopActions(); + }) + .catch(function () { + document.getElementById('chooseSkipPriceAsinShopListBody').innerHTML = '请求失败'; + }); + } + function bindChooseSkipPriceAsinShopActions() { + document.querySelectorAll('[data-choose-skip-price-asin-shop]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('skipPriceAsinShopName').value = (btn.dataset.shopName || '').replace(/"/g, '"'); + if (!document.getElementById('skipPriceAsinGroupSelect').value && btn.dataset.groupId) { + document.getElementById('skipPriceAsinGroupSelect').value = btn.dataset.groupId; + } + document.getElementById('chooseSkipPriceAsinShopModal').classList.remove('show'); + }; + }); + } + function openChooseSkipPriceAsinShopModal() { + var currentGroupId = (document.getElementById('skipPriceAsinGroupSelect').value || '').trim(); + if (currentGroupId) { + document.getElementById('chooseSkipPriceAsinShopGroupId').value = currentGroupId; + } + document.getElementById('chooseSkipPriceAsinShopKeyword').value = (document.getElementById('skipPriceAsinShopName').value || '').trim(); + document.getElementById('chooseSkipPriceAsinShopModal').classList.add('show'); + loadChooseSkipPriceAsinShops(1); + } + function setupSkipPriceAsinShopPicker() { + var input = document.getElementById('skipPriceAsinShopName'); + var button = document.getElementById('btnChooseSkipPriceAsinShop'); + if (!input || !button) return; + var inputParent = input.parentNode; + if (inputParent && inputParent.style && inputParent.style.display === 'flex') return; + var legacyWrap = button.parentNode; + var wrapper = document.createElement('div'); + wrapper.style.display = 'flex'; + wrapper.style.gap = '8px'; + wrapper.style.alignItems = 'center'; + input.parentNode.insertBefore(wrapper, input); + wrapper.appendChild(input); + wrapper.appendChild(button); + button.style.whiteSpace = 'nowrap'; + button.style.marginTop = '0'; + if (legacyWrap && legacyWrap !== wrapper) { + legacyWrap.style.display = 'none'; + } + } + function getSelectedSkipPriceCountries() { + return Array.from(document.getElementById('skipPriceAsinCountries').selectedOptions).map(function (option) { + return option.value; + }); + } + function renderSkipPriceAsinInputs() { + var container = document.getElementById('skipPriceAsinInputs'); + var selectedCountries = getSelectedSkipPriceCountries(); + var existingValues = {}; + container.querySelectorAll('[data-skip-price-country-input]').forEach(function (input) { + existingValues[input.getAttribute('data-skip-price-country-input')] = input.value; + }); + if (!selectedCountries.length) { + container.innerHTML = '
请选择国家后输入 ASIN
'; + return; + } + container.innerHTML = selectedCountries.map(function (countryCode) { + var country = skipPriceCountryColumns.find(function (item) { return item.code === countryCode; }); + var label = country ? country.label : countryCode; + var value = existingValues[countryCode] || ''; + return '
' + + '' + label + '' + + '' + + '
'; + }).join(''); + } + function collectSkipPriceAsinMappings(countries) { + var mappings = {}; + for (var i = 0; i < countries.length; i++) { + var countryCode = countries[i]; + var input = document.querySelector('[data-skip-price-country-input="' + countryCode + '"]'); + var asin = input ? (input.value || '').trim().toUpperCase() : ''; + if (!asin) { + var country = skipPriceCountryColumns.find(function (item) { return item.code === countryCode; }); + var label = country ? country.label : countryCode; + throw new Error(label + ' ASIN 不能为空'); + } + mappings[countryCode] = asin; + } + return mappings; + } + function buildSkipPriceAsinQuery(page) { + var query = 'page=' + (page || 1) + '&page_size=' + skipPriceAsinPageSize; + var groupId = (document.getElementById('skipPriceAsinFilterGroupId').value || '').trim(); + var shopName = (document.getElementById('skipPriceAsinFilterShopName').value || '').trim(); + var asin = (document.getElementById('skipPriceAsinFilterAsin').value || '').trim(); + if (groupId) query += '&group_id=' + encodeURIComponent(groupId); + if (shopName) query += '&shop_name=' + encodeURIComponent(shopName); + if (asin) query += '&asin=' + encodeURIComponent(asin); + return query; + } + function renderSkipPriceAsinCell(item, country) { + var value = item[country.field] || ''; + if (!value) return '-'; + return '
' + + '' + value + '' + + '' + + '' + + '
'; + } + function bindSkipPriceAsinActions() { + document.querySelectorAll('[data-skip-price-asin-edit]').forEach(function (btn) { + btn.onclick = function () { + var shopName = (btn.dataset.shopName || '').replace(/"/g, '"'); + var countryCode = btn.dataset.country || ''; + var currentAsin = (btn.dataset.asin || '').replace(/"/g, '"'); + var nextAsin = prompt('请输入店铺“' + shopName + '”在 ' + countryCode + ' 的 ASIN', currentAsin); + if (nextAsin === null) return; + nextAsin = (nextAsin || '').trim(); + if (!nextAsin) { + alert('ASIN 不能为空'); + return; + } + fetch('/api/admin/skip-price-asin/' + btn.dataset.skipPriceAsinEdit + '/country/' + countryCode, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ asin: nextAsin }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) loadSkipPriceAsin(skipPriceAsinPage); + else alert(res.error || '保存失败'); + }); + }; + }); + document.querySelectorAll('[data-skip-price-asin-delete]').forEach(function (btn) { + btn.onclick = function () { + var shopName = (btn.dataset.shopName || '').replace(/"/g, '"'); + var countryCode = btn.dataset.country || ''; + if (!confirm('确定删除店铺“' + shopName + '”在 ' + countryCode + ' 的 ASIN 吗？')) return; + fetch('/api/admin/skip-price-asin/' + btn.dataset.skipPriceAsinDelete + '/country/' + countryCode, { + method: 'DELETE' + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) loadSkipPriceAsin(skipPriceAsinPage); + else alert(res.error || '删除失败'); + }); + }; + }); + } + function loadSkipPriceAsin(page) { + skipPriceAsinPage = page || 1; + fetch('/api/admin/skip-price-asins?' + buildSkipPriceAsinQuery(skipPriceAsinPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('skipPriceAsinListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无数据'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (skipPriceAsinPage - 1) * skipPriceAsinPageSize + index + 1; + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + + skipPriceCountryColumns.map(function (country) { + return '' + renderSkipPriceAsinCell(item, country) + ''; + }).join('') + + ''; + }).join(''); + } + renderPagination('skipPriceAsinPagination', res.total, res.page, res.page_size, loadSkipPriceAsin); + bindSkipPriceAsinActions(); + }) + .catch(function () { + document.getElementById('skipPriceAsinListBody').innerHTML = '请求失败'; + }); + } + document.getElementById('btnManageSkipPriceAsinGroups').onclick = openShopManageGroupModal; + document.getElementById('btnChooseSkipPriceAsinShop').onclick = openChooseSkipPriceAsinShopModal; + document.getElementById('btnSearchChooseSkipPriceAsinShop').onclick = function () { + loadChooseSkipPriceAsinShops(1); + }; + document.getElementById('chooseSkipPriceAsinShopGroupId').onchange = function () { + loadChooseSkipPriceAsinShops(1); + }; + document.getElementById('chooseSkipPriceAsinShopKeyword').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadChooseSkipPriceAsinShops(1); + } + }); + document.getElementById('btnCloseChooseSkipPriceAsinShopModal').onclick = function () { + document.getElementById('chooseSkipPriceAsinShopModal').classList.remove('show'); + }; + document.getElementById('skipPriceAsinCountries').addEventListener('change', renderSkipPriceAsinInputs); + document.getElementById('btnSearchSkipPriceAsin').onclick = function () { + loadSkipPriceAsin(1); + }; + document.getElementById('skipPriceAsinFilterShopName').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadSkipPriceAsin(1); + } + }); + document.getElementById('skipPriceAsinFilterAsin').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadSkipPriceAsin(1); + } + }); + document.getElementById('btnCreateSkipPriceAsin').onclick = function () { + var groupId = (document.getElementById('skipPriceAsinGroupSelect').value || '').trim(); + var shopName = (document.getElementById('skipPriceAsinShopName').value || '').trim(); + var countries = getSelectedSkipPriceCountries(); + var msgEl = document.getElementById('msgSkipPriceAsin'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupId || !shopName || !countries.length) { + msgEl.textContent = '请完整填写分组、店铺名、国家和 ASIN'; + msgEl.className = 'msg err'; + return; + } + var asinMappings = {}; + try { + asinMappings = collectSkipPriceAsinMappings(countries); + } catch (err) { + msgEl.textContent = err.message || '请输入 ASIN'; + msgEl.className = 'msg err'; + return; + } + var fallbackAsin = ''; + Object.keys(asinMappings).some(function (countryCode) { + fallbackAsin = asinMappings[countryCode] || ''; + return !!fallbackAsin; + }); + fetch('/api/admin/skip-price-asin', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + group_id: Number(groupId), + shop_name: shopName, + countries: countries, + asin: fallbackAsin, + asin_mappings: asinMappings + }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + msgEl.textContent = res.error || '保存失败'; + msgEl.className = 'msg err'; + return; + } + document.getElementById('skipPriceAsinGroupSelect').value = ''; + document.getElementById('skipPriceAsinShopName').value = ''; + Array.from(document.getElementById('skipPriceAsinCountries').options).forEach(function (option) { + option.selected = false; + }); + renderSkipPriceAsinInputs(); + msgEl.textContent = res.msg || '保存成功'; + msgEl.className = 'msg ok'; + loadSkipPriceAsin(1); + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.className = 'msg err'; + }); + }; + setupSkipPriceAsinShopPicker(); + renderSkipPriceAsinInputs(); + function loadVersions() { + fetch('/api/admin/versions') + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('versionListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '暂无版本记录'; + } else { + tbody.innerHTML = items.map(function (v) { + var url = (v.file_url || '').replace(/"/g, '"'); + return '' + (v.version || '') + '' + url + '' + (v.created_at || '') + '下载'; + }).join(''); + } + }) + .catch(function () { + document.getElementById('versionListBody').innerHTML = '请求失败'; + }); + } + document.getElementById('btnUploadVersion').onclick = function () { + var version = (document.getElementById('versionNumber').value || '').trim(); + var fileInput = document.getElementById('versionZip'); + var msgEl = document.getElementById('msgVersion'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!version) { + msgEl.textContent = '请填写版本号'; + msgEl.classList.add('err'); + return; + } + if (!fileInput.files || fileInput.files.length === 0) { + msgEl.textContent = '请选择 zip 压缩包'; + msgEl.classList.add('err'); + return; + } + var file = fileInput.files[0]; + if (!(file.name || '').toLowerCase().endsWith('.zip')) { + msgEl.textContent = '仅支持 .zip 格式'; + msgEl.classList.add('err'); + return; + } + var formData = new FormData(); + formData.append('version', version); + formData.append('file', file); + msgEl.textContent = '上传中...'; + msgEl.classList.remove('err', 'ok'); + fetch('/api/admin/version', { + method: 'POST', + body: formData + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = '发布成功。版本：' + res.version + '，链接：' + (res.file_url || ''); + msgEl.classList.add('ok'); + document.getElementById('versionNumber').value = ''; + fileInput.value = ''; + loadVersions(); + } else { + msgEl.textContent = res.error || '上传失败'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '请求失败'; + msgEl.classList.add('err'); + }); + }; + + // ========== 栏目权限配置 ========== + function loadColumns() { + fetch('/api/admin/columns') + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('columnListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + allColumnsList = res.items || []; + if (allColumnsList.length === 0) { + tbody.innerHTML = '暂无菜单，请在上方新增'; + } else { + tbody.innerHTML = allColumnsList.map(function (c) { + return '' + c.id + '' + (c.name || '') + '' + (c.column_key || '') + '' + (c.created_at || '') + '' + + ' ' + + ''; + }).join(''); + } + bindColumnActions(); + }) + .catch(function () { + document.getElementById('columnListBody').innerHTML = '请求失败'; + }); + } + function bindColumnActions() { + document.querySelectorAll('[data-column-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('editColumnId').value = btn.dataset.columnEdit || ''; + document.getElementById('editColumnName').value = (btn.dataset.name || '').replace(/"/g, '"'); + document.getElementById('editColumnKey').value = (btn.dataset.key || '').replace(/"/g, '"'); + document.getElementById('msgEditColumn').textContent = ''; + document.getElementById('editColumnModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-column-delete]').forEach(function (btn) { + btn.onclick = function () { + if (!confirm('确定删除菜单“' + (btn.dataset.name || '').replace(/"/g, '"') + '”吗？')) return; + fetch('/api/admin/column/' + btn.dataset.columnDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadColumns(); loadColumnsForPermission(); loadAdminMenus(getActiveAdminTabName()); } + else { alert(res.error || '删除失败'); } + }); + }; + }); + } + document.getElementById('btnAddColumn').onclick = function () { + var name = (document.getElementById('columnName').value || '').trim(); + var key = (document.getElementById('columnKey').value || '').trim(); + var msgEl = document.getElementById('msgColumn'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!name) { msgEl.textContent = '请填写菜单名称'; msgEl.classList.add('err'); return; } + if (!key) { + msgEl.textContent = '请填写栏目标识'; msgEl.classList.add('err'); return; + } + fetch('/api/admin/column', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name: name, column_key: key }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = res.msg || '新增成功'; + msgEl.classList.add('ok'); + document.getElementById('columnName').value = ''; + document.getElementById('columnKey').value = ''; + loadColumns(); + loadColumnsForPermission(); + loadAdminMenus(getActiveAdminTabName()); + } else { + msgEl.textContent = res.error || '新增失败'; + msgEl.classList.add('err'); + } + }) + .catch(function () { msgEl.textContent = '请求失败'; msgEl.classList.add('err'); }); + }; + document.getElementById('btnSaveColumn').onclick = function () { + var cid = document.getElementById('editColumnId').value; + var name = (document.getElementById('editColumnName').value || '').trim(); + var key = (document.getElementById('editColumnKey').value || '').trim(); + var msgEl = document.getElementById('msgEditColumn'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!name) { msgEl.textContent = '请填写菜单名称'; msgEl.classList.add('err'); return; } + if (!key) { + msgEl.textContent = '请填写栏目标识'; msgEl.classList.add('err'); return; + } + fetch('/api/admin/column/' + cid, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name: name, column_key: key }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editColumnModal').classList.remove('show'); + loadColumns(); + loadColumnsForPermission(); + loadAdminMenus(getActiveAdminTabName()); + } else { + msgEl.textContent = res.error || '保存失败'; + msgEl.classList.add('err'); + } + }); + }; + document.getElementById('btnCloseEditColumn').onclick = function () { + document.getElementById('editColumnModal').classList.remove('show'); + }; + + function loadColumns() { + fetch('/api/admin/columns') + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('columnListBody'); + if (!res.success) { + tbody.innerHTML = '加载失败: ' + (res.error || '') + ''; + return; + } + allColumnsList = res.items || []; + if (allColumnsList.length === 0) { + tbody.innerHTML = '暂无菜单，请先在上方新增'; + } else { + tbody.innerHTML = allColumnsList.map(function (c, index) { + var moveButtons = + ' ' + + ' '; + return '' + c.id + '' + (c.name || '') + '' + (c.column_key || '') + '' + ((c.menu_type || '') === 'admin' ? '后台(admin)' : '软件(app)') + '' + (c.sort_order != null ? c.sort_order : 0) + '' + (c.route_path || '') + '' + (c.created_at || '') + '' + + moveButtons + + ' ' + + ''; + }).join(''); + } + bindColumnActions(); + }) + .catch(function () { + document.getElementById('columnListBody').innerHTML = '请求失败'; + }); + } + function bindColumnActions() { + document.querySelectorAll('[data-column-move-up]').forEach(function (btn) { + btn.onclick = function () { + if (btn.disabled) return; + moveColumnItem(btn.dataset.columnMoveUp, -1, btn); + }; + }); + document.querySelectorAll('[data-column-move-down]').forEach(function (btn) { + btn.onclick = function () { + if (btn.disabled) return; + moveColumnItem(btn.dataset.columnMoveDown, 1, btn); + }; + }); + document.querySelectorAll('[data-column-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('editColumnId').value = btn.dataset.columnEdit || ''; + document.getElementById('editColumnName').value = (btn.dataset.name || '').replace(/"/g, '"'); + document.getElementById('editColumnKey').value = (btn.dataset.key || '').replace(/"/g, '"'); + document.getElementById('editColumnRoutePath').value = (btn.dataset.route || '').replace(/"/g, '"'); + document.getElementById('editColumnMenuType').value = ((btn.dataset.menuType || 'app').replace(/"/g, '"') || 'app'); + document.getElementById('editColumnSortOrder').value = ((btn.dataset.sortOrder || '0').replace(/"/g, '"') || '0'); + document.getElementById('msgEditColumn').textContent = ''; + document.getElementById('editColumnModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-column-delete]').forEach(function (btn) { + btn.onclick = function () { + if (!confirm('确定删除菜单“' + (btn.dataset.name || '').replace(/"/g, '"') + '”吗？')) return; + fetch('/api/admin/column/' + btn.dataset.columnDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadColumns(); loadColumnsForPermission(); loadAdminMenus(getActiveAdminTabName()); } + else { alert(res.error || '删除失败'); } + }); + }; + }); + } + function updateColumnSortOrder(column, sortOrder) { + return fetch('/api/admin/column/' + column.id, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + name: column.name || '', + column_key: column.column_key || '', + route_path: column.route_path || '', + menu_type: column.menu_type || 'app', + sort_order: sortOrder + }) + }).then(function (r) { return r.json(); }); + } + function moveColumnItem(columnId, delta, triggerBtn) { + var currentIndex = -1; + for (var i = 0; i < allColumnsList.length; i++) { + if (String(allColumnsList[i].id) === String(columnId)) { + currentIndex = i; + break; + } + } + if (currentIndex < 0) return; + var targetIndex = currentIndex + delta; + if (targetIndex < 0 || targetIndex >= allColumnsList.length) return; + var currentItem = allColumnsList[currentIndex]; + var targetItem = allColumnsList[targetIndex]; + if (!currentItem || !targetItem) return; + if (triggerBtn) triggerBtn.disabled = true; + var currentSort = currentItem.sort_order != null ? currentItem.sort_order : (currentIndex + 1); + var targetSort = targetItem.sort_order != null ? targetItem.sort_order : (targetIndex + 1); + Promise.all([ + updateColumnSortOrder(currentItem, targetSort), + updateColumnSortOrder(targetItem, currentSort) + ]).then(function (results) { + var failed = (results || []).find(function (res) { return !res || !res.success; }); + if (failed) { + alert((failed && failed.error) || '排序保存失败'); + return; + } + loadColumns(); + loadColumnsForPermission(); + loadAdminMenus(getActiveAdminTabName()); + }).catch(function () { + alert('排序保存失败'); + }).finally(function () { + if (triggerBtn) triggerBtn.disabled = false; + }); + } + document.getElementById('btnAddColumn').onclick = function () { + var name = (document.getElementById('columnName').value || '').trim(); + var key = (document.getElementById('columnKey').value || '').trim(); + var routePath = (document.getElementById('columnRoutePath').value || '').trim(); + var sortOrderValue = (document.getElementById('columnSortOrder').value || '').trim(); + var menuType = (document.getElementById('columnMenuType').value || 'admin').trim() || 'admin'; + var sortOrder = sortOrderValue === '' ? null : parseInt(sortOrderValue, 10); + var msgEl = document.getElementById('msgColumn'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!name) { msgEl.textContent = '请填写菜单名称'; msgEl.classList.add('err'); return; } + if (!key) { + msgEl.textContent = '请填写栏目标识'; msgEl.classList.add('err'); return; + } + if (!routePath) { + msgEl.textContent = '请填写菜单路由'; msgEl.classList.add('err'); return; + } + if (sortOrderValue !== '' && isNaN(sortOrder)) { + msgEl.textContent = '排序必须是数字'; msgEl.classList.add('err'); return; + } + fetch('/api/admin/column', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name: name, column_key: key, route_path: routePath, menu_type: menuType, sort_order: sortOrder }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = res.msg || '新增成功'; + msgEl.classList.add('ok'); + document.getElementById('columnName').value = ''; + document.getElementById('columnKey').value = ''; + document.getElementById('columnRoutePath').value = ''; + document.getElementById('columnSortOrder').value = ''; + document.getElementById('columnMenuType').value = 'admin'; + loadColumns(); + loadColumnsForPermission(); + loadAdminMenus(getActiveAdminTabName()); + } else { + msgEl.textContent = res.error || '新增失败'; + msgEl.classList.add('err'); + } + }) + .catch(function () { msgEl.textContent = '请求失败'; msgEl.classList.add('err'); }); + }; + document.getElementById('btnSaveColumn').onclick = function () { + var cid = document.getElementById('editColumnId').value; + var name = (document.getElementById('editColumnName').value || '').trim(); + var key = (document.getElementById('editColumnKey').value || '').trim(); + var routePath = (document.getElementById('editColumnRoutePath').value || '').trim(); + var sortOrderValue = (document.getElementById('editColumnSortOrder').value || '').trim(); + var menuType = (document.getElementById('editColumnMenuType').value || 'admin').trim() || 'admin'; + var sortOrder = sortOrderValue === '' ? null : parseInt(sortOrderValue, 10); + var msgEl = document.getElementById('msgEditColumn'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!name) { msgEl.textContent = '请填写菜单名称'; msgEl.classList.add('err'); return; } + if (!key) { + msgEl.textContent = '请填写栏目标识'; msgEl.classList.add('err'); return; + } + if (!routePath) { + msgEl.textContent = '请填写菜单路由'; msgEl.classList.add('err'); return; + } + if (sortOrderValue !== '' && isNaN(sortOrder)) { + msgEl.textContent = '排序必须是数字'; msgEl.classList.add('err'); return; + } + fetch('/api/admin/column/' + cid, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name: name, column_key: key, route_path: routePath, menu_type: menuType, sort_order: sortOrder }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editColumnModal').classList.remove('show'); + loadColumns(); + loadColumnsForPermission(); + loadAdminMenus(getActiveAdminTabName()); + } else { + msgEl.textContent = res.error || '保存失败'; + msgEl.classList.add('err'); + } + }); + }; + + // ========== 分页 ========== + function renderPagination(elId, total, page, pageSize, onPage) { + var el = document.getElementById(elId); + if (!el) return; + var totalPages = Math.max(1, Math.ceil(total / pageSize)); + el.innerHTML = '共' + total + ' 条' + + '' + + '第' + page + ' / ' + totalPages + ' 页' + + ''; + el.querySelectorAll('[data-p]').forEach(function (b) { + if (!b.disabled) b.onclick = function () { onPage(parseInt(b.dataset.p, 10)); }; + }); + } + + // 初始化 + function loadAdminCurrentUser() { + fetch('/api/admin/current-user') + .then(function (r) { + if (r.status === 404) { + return fetch('/api/auth/check') + .then(function (fallbackResp) { return fallbackResp.json(); }) + .then(function (fallbackRes) { + if (fallbackRes && fallbackRes.logged_in) { + return { + success: true, + item: { + username: '当前用户', + role: '' + } + }; + } + return { success: false }; + }); + } + return r.json(); + }) + .then(function (res) { + var nameEl = document.getElementById('adminCurrentUsername'); + var roleEl = document.getElementById('adminCurrentUserRole'); + if (!res.success) { + nameEl.textContent = '未登录'; + roleEl.style.display = 'none'; + return; + } + var item = res.item || {}; + nameEl.textContent = item.username || '管理员'; + if (item.role) { + roleEl.textContent = item.role === 'super_admin' ? '超级管理员' : '管理员'; + roleEl.style.display = 'inline-block'; + } else { + roleEl.style.display = 'none'; + } + }) + .catch(function () { + fetch('/api/auth/check') + .then(function (r) { return r.json(); }) + .then(function (res) { + document.getElementById('adminCurrentUsername').textContent = res && res.logged_in ? '当前用户' : '未登录'; + document.getElementById('adminCurrentUserRole').style.display = 'none'; + }) + .catch(function () { + document.getElementById('adminCurrentUsername').textContent = '当前用户'; + document.getElementById('adminCurrentUserRole').style.display = 'none'; + }); + }); + } + + document.getElementById('btnAdminLogout').onclick = function () { + fetch('/api/admin/logout', { + method: 'POST', + headers: { 'X-Requested-With': 'XMLHttpRequest' } + }) + .then(function (r) { + if (r.status === 404) { + window.location.href = '/logout'; + return null; + } + return r.json(); + }) + .then(function (res) { + if (!res) return; + if (!res.success) { + alert(res.error || '退出失败'); + return; + } + window.location.href = res.redirect || '/login'; + }) + .catch(function () { + window.location.href = '/logout'; + }); + }; + + loadAdminCurrentUser(); + loadUserOptions(); + loadColumnsForPermission(); + loadShopManageGroups(); + loadAdminMenus(); + }) (); + \ No newline at end of file diff --git a/backend/web_source/_tmp_prefix.js b/backend/web_source/_tmp_prefix.js new file mode 100644 index 0000000..c578064 --- /dev/null +++ b/backend/web_source/_tmp_prefix.js @@ -0,0 +1,2000 @@ + + (function () { + // Tab 鍒囨崲 + var adminTabsEl = document.getElementById('adminTabs'); + if (adminTabsEl) adminTabsEl.innerHTML = ''; + var activeAdminTabName = ''; + var ADMIN_PANEL_MAP = { + 'users': 'panel-users', + 'columns': 'panel-columns', + 'dedupe-total-data': 'panel-dedupe-total-data', + 'shop-keys': 'panel-shop-keys', + 'shop-manage': 'panel-shop-manage', + 'skip-price-asin': 'panel-skip-price-asin', + 'history': 'panel-history', + 'version': 'panel-version' + }; + function runTabLoader(tabName) { + if (tabName === 'users') { loadUsers(1); loadColumnsForPermission(); } + else if (tabName === 'columns') loadColumns(); + else if (tabName === 'dedupe-total-data') loadDedupeTotalData(1); + else if (tabName === 'shop-keys') loadShopKeys(1); + else if (tabName === 'shop-manage') loadShopManage(1); + else if (tabName === 'skip-price-asin') loadSkipPriceAsin(1); + else if (tabName === 'history') loadHistory(1); + else if (tabName === 'version') loadVersions(); + } + function hideAllAdminPanels() { + document.querySelectorAll('.tab-panel').forEach(function (panel) { + panel.classList.remove('active'); + panel.style.display = 'none'; + }); + } + function getActiveAdminTabName() { + return activeAdminTabName; + } + function activateAdminTab(tabName) { + var panelId = ADMIN_PANEL_MAP[tabName]; + var panel = panelId ? document.getElementById(panelId) : null; + if (!panel) return; + activeAdminTabName = tabName; + document.querySelectorAll('#adminTabs .tab').forEach(function (tab) { + tab.classList.toggle('active', tab.dataset.tab === tabName); + }); + hideAllAdminPanels(); + panel.style.display = ''; + panel.classList.add('active'); + runTabLoader(tabName); + } + function renderAdminTabs(items) { + var knownItems = (items || []).filter(function (item) { + return !!ADMIN_PANEL_MAP[item.route_path]; + }); + if (!knownItems.length) { + activeAdminTabName = ''; + if (adminTabsEl) adminTabsEl.innerHTML = '
鏆傛棤鍙敤鑿滃崟
'; + hideAllAdminPanels(); + return; + } + if (adminTabsEl) { + adminTabsEl.innerHTML = knownItems.map(function (item) { + return '
' + (item.name || item.route_path) + '
'; + }).join(''); + } + document.querySelectorAll('#adminTabs .tab').forEach(function (tab) { + tab.onclick = function () { + activateAdminTab(tab.dataset.tab); + }; + }); + var fallbackTab = activeAdminTabName && knownItems.some(function (item) { return item.route_path === activeAdminTabName; }) + ? activeAdminTabName + : knownItems[0].route_path; + activateAdminTab(fallbackTab); + } + function loadAdminMenus(preferredTab) { + if (preferredTab) activeAdminTabName = preferredTab; + fetch('/api/admin/current-user/menus') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + if (adminTabsEl) adminTabsEl.innerHTML = '
鑿滃崟鍔犺浇澶辫触
'; + hideAllAdminPanels(); + return; + } + renderAdminTabs(res.items || []); + }) + .catch(function () { + if (adminTabsEl) adminTabsEl.innerHTML = '
鑿滃崟鍔犺浇澶辫触
'; + hideAllAdminPanels(); + }); + } + hideAllAdminPanels(); + + // ========== 鐢ㄦ埛绠＄悊 ========== + var userPage = 1, userPageSize = 15; + var currentUserId = null; + var currentUserRole = 'admin'; + var currentUserUsername = ''; + var adminsList = []; + function roleLabel(role) { + if (role === 'super_admin') return '瓒呯骇绠＄悊鍛?; + if (role === 'admin') return '绠＄悊鍛?; + return '鏅€氳处鍙?; + } + function buildUserListQuery(page) { + var q = 'page=' + (page || 1) + '&page_size=' + userPageSize; + var kw = (document.getElementById('searchUsername').value || '').trim(); + if (kw) q += '&username=' + encodeURIComponent(kw); + var cby = document.getElementById('filterCreatedBy').value; + if (cby) q += '&created_by_id=' + encodeURIComponent(cby); + return q; + } + function loadUsers(page) { + userPage = page || 1; + fetch('/api/admin/users?' + buildUserListQuery(userPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('userListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + currentUserId = res.current_user_id || null; + currentUserRole = res.current_user_role || 'admin'; + currentUserUsername = (res.current_user_username || '').trim(); + adminsList = res.admins || []; + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '鏆傛棤鐢ㄦ埛'; + } else { + tbody.innerHTML = items.map(function (u) { + return '' + u.id + '' + (u.username || '') + '' + + roleLabel(u.role || 'normal') + '' + (u.creator_username || '-') + '' + (u.created_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('userPagination', res.total, res.page, res.page_size, loadUsers); + bindUserActions(); + updateCreateFormByRole(); + updateUserFilterByRole(); + }) + .catch(function () { + document.getElementById('userListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + function updateUserFilterByRole() { + var grp = document.getElementById('filterCreatedByGroup'); + var sel = document.getElementById('filterCreatedBy'); + if (currentUserRole === 'super_admin') { + grp.style.display = 'block'; + var cur = sel.value; + sel.innerHTML = ''; + adminsList.forEach(function (a) { + var opt = document.createElement('option'); + opt.value = a.id; + opt.textContent = a.username; + sel.appendChild(opt); + }); + sel.value = cur || ''; + } else { + grp.style.display = 'none'; + } + } + + function updateDedupeTotalDataAccess() { + var tab = document.querySelector('.tab[data-tab="dedupe-total-data"]'); + var panel = document.getElementById('panel-dedupe-total-data'); + var canUse = currentUserRole === 'super_admin' || (currentUserRole === 'admin' && currentUserUsername === ''); + if (tab) tab.style.display = canUse ? '' : 'none'; + if (panel) panel.style.display = canUse ? '' : 'none'; + if (!canUse && tab && tab.classList.contains('active')) { + tab.classList.remove('active'); + if (panel) panel.classList.remove('active'); + var usersTab = document.querySelector('.tab[data-tab="users"]'); + var usersPanel = document.getElementById('panel-users'); + if (usersTab) usersTab.classList.add('active'); + if (usersPanel) usersPanel.classList.add('active'); + } + } + function updateShopManageAccess() { + var tab = document.querySelector('.tab[data-tab="shop-manage"]'); + var panel = document.getElementById('panel-shop-manage'); + if (!tab || !panel) return; + var canUse = currentUserRole === 'super_admin' || + !!currentUserAdminPermissionKeys['admin_shop_manage'] || + !!currentUserAdminPermissionRoutes['shop-manage']; + tab.style.display = canUse ? '' : 'none'; + panel.style.display = canUse ? '' : 'none'; + if (!canUse && tab.classList.contains('active')) { + tab.classList.remove('active'); + panel.classList.remove('active'); + var usersTab = document.querySelector('.tab[data-tab="users"]'); + var usersPanel = document.getElementById('panel-users'); + if (usersTab) usersTab.classList.add('active'); + if (usersPanel) usersPanel.classList.add('active'); + } + } + function loadCurrentUserAdminPermissions() { + currentUserAdminPermissionKeys = {}; + currentUserAdminPermissionRoutes = {}; + if (!currentUserId || currentUserRole === 'super_admin') { + updateShopManageAccess(); + return; + } + fetch('/api/admin/user/' + currentUserId + '/column-permissions?menu_type=admin') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + updateShopManageAccess(); + return; + } + (res.items || []).forEach(function (item) { + var columnKey = (item.column_key || '').trim(); + var routePath = (item.route_path || '').trim(); + if (columnKey) currentUserAdminPermissionKeys[columnKey] = true; + if (routePath) currentUserAdminPermissionRoutes[routePath] = true; + }); + updateShopManageAccess(); + }) + .catch(function () { + updateShopManageAccess(); + }); + } + function applyTabAccess(tabName, canUse) { + var tab = document.querySelector('.tab[data-tab="' + tabName + '"]'); + var panel = document.getElementById('panel-' + tabName); + if (tab) tab.style.display = canUse ? '' : 'none'; + if (panel) panel.style.display = canUse ? '' : 'none'; + if (!canUse && tab && tab.classList.contains('active')) { + tab.classList.remove('active'); + if (panel) panel.classList.remove('active'); + var usersTab = document.querySelector('.tab[data-tab="users"]'); + var usersPanel = document.getElementById('panel-users'); + if (usersTab) usersTab.classList.add('active'); + if (usersPanel) usersPanel.classList.add('active'); + } + } + function hasAdminTabAccess(tabName) { + var config = ADMIN_TAB_ACCESS_CONFIG[tabName]; + if (!config) return true; + if (currentUserRole === 'super_admin') return true; + if (config.superAdminOnly) return false; + return !!currentUserAdminPermissionKeys[config.columnKey] || + !!currentUserAdminPermissionRoutes[config.routePath]; + } + function refreshAdminTabAccess() { + Object.keys(ADMIN_TAB_ACCESS_CONFIG).forEach(function (tabName) { + applyTabAccess(tabName, hasAdminTabAccess(tabName)); + }); + } + function loadCurrentUserAdminPermissions() { + currentUserAdminPermissionKeys = {}; + currentUserAdminPermissionRoutes = {}; + if (!currentUserId || currentUserRole === 'super_admin') { + refreshAdminTabAccess(); + return; + } + fetch('/api/admin/user/' + currentUserId + '/column-permissions?menu_type=admin') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + refreshAdminTabAccess(); + return; + } + (res.items || []).forEach(function (item) { + var columnKey = (item.column_key || '').trim(); + var routePath = (item.route_path || '').trim(); + if (columnKey) currentUserAdminPermissionKeys[columnKey] = true; + if (routePath) currentUserAdminPermissionRoutes[routePath] = true; + }); + refreshAdminTabAccess(); + }) + .catch(function () { + refreshAdminTabAccess(); + }); + } + var allColumnsList = []; + function loadColumnsForPermission() { + fetch('/api/admin/columns?menu_type=admin') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) return; + allColumnsList = res.items || []; + renderColumnPermissionWrap('createColumnPermissionWrap'); + renderColumnPermissionWrap('editColumnPermissionWrap'); + var selCreate = document.getElementById('createColumnPermissionWrap'); + var selEdit = document.getElementById('editColumnPermissionWrap'); + if (selCreate && !selCreate._colCardsBound) { + selCreate._colCardsBound = true; + selCreate.onchange = function () { renderColumnCards('createColumnPermissionWrap'); }; + } + if (selEdit && !selEdit._colCardsBound) { + selEdit._colCardsBound = true; + selEdit.onchange = function () { renderColumnCards('editColumnPermissionWrap'); }; + } + }) + .catch(function () { }); + } + var columnCardsContainerMap = { createColumnPermissionWrap: 'createColumnCards', editColumnPermissionWrap: 'editColumnCards' }; + function renderColumnCards(selectId) { + var sel = document.getElementById(selectId); + var cardsId = columnCardsContainerMap[selectId]; + var cardsEl = cardsId ? document.getElementById(cardsId) : null; + if (!sel || sel.tagName !== 'SELECT' || !cardsEl) return; + cardsEl.innerHTML = ''; + for (var i = 0; i < sel.options.length; i++) { + var opt = sel.options[i]; + if (opt.disabled || !opt.selected) continue; + var card = document.createElement('span'); + card.className = 'column-permission-card'; + card.textContent = opt.textContent; + var btn = document.createElement('button'); + btn.type = 'button'; + btn.className = 'col-card-remove'; + btn.setAttribute('aria-label', '绉婚櫎'); + btn.textContent = '脳'; + (function (option, seldId) { + btn.onclick = function () { + option.selected = false; + renderColumnCards(seldId); + }; + })(opt, selectId); + card.appendChild(btn); + cardsEl.appendChild(card); + } + } + function renderColumnPermissionWrap(wrapId) { + var sel = document.getElementById(wrapId); + if (!sel || sel.tagName !== 'SELECT') return; + sel.innerHTML = ''; + allColumnsList.forEach(function (c) { + var opt = document.createElement('option'); + opt.value = c.id; + opt.textContent = c.name + ' (' + c.column_key + ')'; + sel.appendChild(opt); + }); + if (allColumnsList.length === 0) { + var opt = document.createElement('option'); + opt.disabled = true; + opt.textContent = '鏆傛棤鑿滃崟锛岃鍏堝湪鈥滄爮鐩潈闄愰厤缃€濅腑鏂板鑿滃崟'; + sel.appendChild(opt); + } + renderColumnCards(wrapId); + } + function getSelectedColumnIds(wrapId) { + var sel = document.getElementById(wrapId); + if (!sel || sel.tagName !== 'SELECT') return []; + var ids = []; + for (var i = 0; i < sel.options.length; i++) { + if (sel.options[i].selected) { + var v = parseInt(sel.options[i].value, 10); + if (!isNaN(v)) ids.push(v); + } + } + return ids; + } + function setColumnPermissionCheckboxes(wrapId, columnIds) { + var sel = document.getElementById(wrapId); + if (!sel || sel.tagName !== 'SELECT') return; + var set = {}; + (columnIds || []).forEach(function (id) { set[id] = true; }); + for (var i = 0; i < sel.options.length; i++) { + var opt = sel.options[i]; + if (opt.disabled) continue; + opt.selected = set[parseInt(opt.value, 10)] || false; + } + renderColumnCards(wrapId); + } + function updateCreateFormByRole() { + var roleSel = document.getElementById('createRole'); + var optAdmin = document.getElementById('optAdmin'); + var formCreatedBy = document.getElementById('formGroupCreatedBy'); + var selCreatedBy = document.getElementById('createCreatedBy'); + if (currentUserRole === 'super_admin') { + if (optAdmin) optAdmin.style.display = ''; + formCreatedBy.style.display = (roleSel.value === 'normal') ? 'block' : 'none'; + selCreatedBy.innerHTML = ''; + (res.items || []).forEach(function (u) { + var opt = document.createElement('option'); + opt.value = u.id; + opt.textContent = u.username + ' (' + roleLabel(u.role || 'normal') + ')'; + sel.appendChild(opt); + }); + sel.value = cur || ''; + }); + } + var shopManageGroupUsers = []; + function refreshShopManageGroupUserSelect(selectedUserId) { + var sel = document.getElementById('shopManageGroupUserSelect'); + if (!sel) return; + var opts = ['']; + shopManageGroupUsers.forEach(function (u) { + opts.push(''); + }); + sel.innerHTML = opts.join(''); + if (selectedUserId != null && selectedUserId !== '') { + sel.value = String(selectedUserId); + } + syncShopManageGroupNameWithUser(); + } + function syncShopManageGroupNameWithUser() { + var sel = document.getElementById('shopManageGroupUserSelect'); + var input = document.getElementById('shopManageGroupInput'); + if (!sel || !input) return; + var selectedUser = null; + shopManageGroupUsers.some(function (u) { + if (String(u.id) === String(sel.value || '')) { + selectedUser = u; + return true; + } + return false; + }); + input.value = selectedUser ? (selectedUser.username || '') : ''; + } + function loadUserOptions() { + return fetch('/api/admin/users?page=1&page_size=999') + .then(function (r) { return r.json(); }) + .then(function (res) { + var items = res.items || []; + shopManageGroupUsers = items.map(function (u) { + return { id: u.id, username: u.username || '', role: u.role || 'normal' }; + }); + refreshShopManageGroupUserSelect(document.getElementById('shopManageGroupUserSelect') ? document.getElementById('shopManageGroupUserSelect').value : ''); + var sel = document.getElementById('filterUser'); + var cur = sel.value; + sel.innerHTML = ''; + items.forEach(function (u) { + var opt = document.createElement('option'); + opt.value = u.id; + opt.textContent = u.username + ' (' + roleLabel(u.role || 'normal') + ')'; + sel.appendChild(opt); + }); + sel.value = cur || ''; + }); + } + document.getElementById('btnFilterHistory').onclick = function () { loadHistory(1); }; + + // ========== 鏁版嵁鍘婚噸鎬绘暟鎹?========== + var dedupeTotalDataPage = 1, dedupeTotalDataPageSize = 15; + function buildDedupeTotalDataQuery(page) { + var q = 'page=' + (page || 1) + '&page_size=' + dedupeTotalDataPageSize; + var keyword = (document.getElementById('searchDedupeTotalData').value || '').trim(); + if (keyword) q += '&keyword=' + encodeURIComponent(keyword); + return q; + } + function loadDedupeTotalData(page) { + dedupeTotalDataPage = page || 1; + fetch('/api/admin/dedupe-total-data?' + buildDedupeTotalDataQuery(dedupeTotalDataPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('dedupeTotalDataListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '鏆傛棤鎬绘暟鎹?/td>'; + } else { + tbody.innerHTML = items.map(function (item) { + return '' + item.id + '' + (item.data_value || '') + '' + (item.created_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('dedupeTotalDataPagination', res.total, res.page, res.page_size, loadDedupeTotalData); + bindDedupeTotalDataActions(); + }) + .catch(function () { + document.getElementById('dedupeTotalDataListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + function bindDedupeTotalDataActions() { + document.querySelectorAll('[data-dedupe-total-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('editDedupeTotalDataId').value = btn.dataset.dedupeTotalEdit || ''; + document.getElementById('editDedupeTotalDataValue').value = (btn.dataset.value || '').replace(/"/g, '"'); + document.getElementById('msgEditDedupeTotalData').textContent = ''; + document.getElementById('msgEditDedupeTotalData').className = 'msg'; + document.getElementById('editDedupeTotalDataModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-dedupe-total-delete]').forEach(function (btn) { + btn.onclick = function () { + var value = (btn.dataset.value || '').replace(/"/g, '"'); + if (!confirm('纭畾鍒犻櫎鎬绘暟鎹€? + value + '鈥濆悧锛?)) return; + fetch('/api/admin/dedupe-total-data/' + btn.dataset.dedupeTotalDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadDedupeTotalData(dedupeTotalDataPage); } + else { alert(res.error || '鍒犻櫎澶辫触'); } + }); + }; + }); + } + document.getElementById('btnSearchDedupeTotalData').onclick = function () { loadDedupeTotalData(1); }; + var dedupeImportPollTimer = null; + var dedupeDeleteImportPollTimer = null; + function stopDedupeImportProgress() { + if (dedupeImportPollTimer) { + clearInterval(dedupeImportPollTimer); + dedupeImportPollTimer = null; + } + } + function stopDedupeDeleteImportProgress() { + if (dedupeDeleteImportPollTimer) { + clearInterval(dedupeDeleteImportPollTimer); + dedupeDeleteImportPollTimer = null; + } + } + function setDedupeImportProgress(percent, text) { + var wrap = document.getElementById('dedupeTotalDataProgressWrap'); + var fill = document.getElementById('dedupeTotalDataProgressFill'); + var textEl = document.getElementById('dedupeTotalDataProgressText'); + wrap.style.display = 'block'; + fill.style.width = Math.max(0, Math.min(100, percent || 0)) + '%'; + textEl.textContent = text || ''; + } + function setDedupeDeleteImportProgress(percent, text) { + var wrap = document.getElementById('dedupeTotalDataDeleteProgressWrap'); + var fill = document.getElementById('dedupeTotalDataDeleteProgressFill'); + var textEl = document.getElementById('dedupeTotalDataDeleteProgressText'); + wrap.style.display = 'block'; + fill.style.width = Math.max(0, Math.min(100, percent || 0)) + '%'; + textEl.textContent = text || ''; + } + function pollDedupeImport(importId) { + stopDedupeImportProgress(); + function tick() { + fetch('/api/admin/dedupe-total-data/import/' + encodeURIComponent(importId)) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = res.error || '鏌ヨ瀵煎叆杩涘害澶辫触'; + document.getElementById('msgDedupeTotalData').className = 'msg err'; + return; + } + var progress = res.progress || {}; + var totalRows = progress.total_rows || 0; + var processedRows = progress.processed_rows || 0; + var percent = totalRows > 0 ? Math.round(processedRows * 100 / totalRows) : 0; + setDedupeImportProgress(percent, '澶勭悊涓細宸插鐞?' + processedRows + ' / ' + totalRows + '锛屾柊澧?' + (progress.inserted_count || 0) + '锛岃烦杩?' + (progress.skipped_count || 0)); + if (progress.status === 'success') { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = '瀵煎叆鎴愬姛锛氭€昏鏁?' + (progress.total_rows || 0) + '锛孉SIN 鏁伴噺 ' + (progress.asin_count || 0) + '锛屾柊澧?' + (progress.inserted_count || 0) + '锛岃烦杩?' + (progress.skipped_count || 0); + document.getElementById('msgDedupeTotalData').className = 'msg ok'; + loadDedupeTotalData(1); + } else if (progress.status === 'failed') { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = progress.error_message || '瀵煎叆澶辫触'; + document.getElementById('msgDedupeTotalData').className = 'msg err'; + } + }) + .catch(function () { + stopDedupeImportProgress(); + document.getElementById('msgDedupeTotalData').textContent = '鏌ヨ瀵煎叆杩涘害澶辫触'; + document.getElementById('msgDedupeTotalData').className = 'msg err'; + }); + } + tick(); + dedupeImportPollTimer = setInterval(tick, 1000); + } + function pollDedupeDeleteImport(importId) { + stopDedupeDeleteImportProgress(); + function tick() { + fetch('/api/admin/dedupe-total-data/delete-import/' + encodeURIComponent(importId)) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = res.error || '鏌ヨ鍒犻櫎杩涘害澶辫触'; + document.getElementById('msgDeleteDedupeTotalData').className = 'msg err'; + return; + } + var progress = res.progress || {}; + var totalRows = progress.total_rows || 0; + var processedRows = progress.processed_rows || 0; + var percent = totalRows > 0 ? Math.round(processedRows * 100 / totalRows) : 0; + setDedupeDeleteImportProgress(percent, '澶勭悊涓細宸插鐞?' + processedRows + ' / ' + totalRows + '锛屽垹闄?' + (progress.deleted_count || 0) + '锛岃烦杩?' + (progress.skipped_count || 0)); + if (progress.status === 'success') { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = '鍒犻櫎鎴愬姛锛氭€昏鏁?' + (progress.total_rows || 0) + '锛孉SIN 鏁伴噺 ' + (progress.asin_count || 0) + '锛屽垹闄?' + (progress.deleted_count || 0) + '锛岃烦杩?' + (progress.skipped_count || 0); + document.getElementById('msgDeleteDedupeTotalData').className = 'msg ok'; + loadDedupeTotalData(1); + } else if (progress.status === 'failed') { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = progress.error_message || '鍒犻櫎澶辫触'; + document.getElementById('msgDeleteDedupeTotalData').className = 'msg err'; + } + }) + .catch(function () { + stopDedupeDeleteImportProgress(); + document.getElementById('msgDeleteDedupeTotalData').textContent = '鏌ヨ鍒犻櫎杩涘害澶辫触'; + document.getElementById('msgDeleteDedupeTotalData').className = 'msg err'; + }); + } + tick(); + dedupeDeleteImportPollTimer = setInterval(tick, 1000); + } + + document.getElementById('btnAddDedupeTotalData').onclick = function () { + var fileInput = document.getElementById('dedupeTotalDataFile'); + var msgEl = document.getElementById('msgDedupeTotalData'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + stopDedupeImportProgress(); + document.getElementById('dedupeTotalDataProgressWrap').style.display = 'none'; + if (!fileInput.files || fileInput.files.length === 0) { + msgEl.textContent = '璇烽€夋嫨 Excel 鏂囦欢'; + msgEl.classList.add('err'); + return; + } + var file = fileInput.files[0]; + var lowerName = (file.name || '').toLowerCase(); + if (!(lowerName.endsWith('.xlsx') || lowerName.endsWith('.xls'))) { + msgEl.textContent = '浠呮敮鎸?.xlsx 鎴?.xls 鏂囦欢'; + msgEl.classList.add('err'); + return; + } + var formData = new FormData(); + formData.append('file', file); + var xhr = new XMLHttpRequest(); + xhr.open('POST', '/api/admin/dedupe-total-data/import', true); + xhr.upload.onprogress = function (event) { + if (event.lengthComputable) { + var percent = Math.round(event.loaded * 100 / event.total); + setDedupeImportProgress(percent, '涓婁紶涓細' + percent + '%'); + } + }; + xhr.onreadystatechange = function () { + if (xhr.readyState !== 4) return; + if (xhr.status < 200 || xhr.status >= 300) { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + return; + } + var res; + try { res = JSON.parse(xhr.responseText || '{}'); } catch (e) { res = { success: false, error: '杩斿洖鏍煎紡閿欒' }; } + if (!res.success) { + msgEl.textContent = res.error || '瀵煎叆澶辫触'; + msgEl.className = 'msg err'; + return; + } + setDedupeImportProgress(100, '涓婁紶瀹屾垚锛屽悗绔鐞嗕腑...'); + pollDedupeImport(res.import_id); + fileInput.value = ''; + }; + xhr.onerror = function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }; + xhr.send(formData); + }; + document.getElementById('btnDeleteImportDedupeTotalData').onclick = function () { + var fileInput = document.getElementById('dedupeTotalDataDeleteFile'); + var msgEl = document.getElementById('msgDeleteDedupeTotalData'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + stopDedupeDeleteImportProgress(); + document.getElementById('dedupeTotalDataDeleteProgressWrap').style.display = 'none'; + if (!fileInput.files || fileInput.files.length === 0) { + msgEl.textContent = '璇烽€夋嫨 Excel 鏂囦欢'; + msgEl.classList.add('err'); + return; + } + var file = fileInput.files[0]; + var lowerName = (file.name || '').toLowerCase(); + if (!(lowerName.endsWith('.xlsx') || lowerName.endsWith('.xls'))) { + msgEl.textContent = '浠呮敮鎸?.xlsx 鎴?.xls 鏂囦欢'; + msgEl.classList.add('err'); + return; + } + if (!confirm('纭畾鎸?Excel 涓殑 ASIN 鎵归噺鍒犻櫎鍖归厤鐨勬€绘暟鎹悧锛?)) { + return; + } + var formData = new FormData(); + formData.append('file', file); + var xhr = new XMLHttpRequest(); + xhr.open('POST', '/api/admin/dedupe-total-data/delete-import', true); + xhr.upload.onprogress = function (event) { + if (event.lengthComputable) { + var percent = Math.round(event.loaded * 100 / event.total); + setDedupeDeleteImportProgress(percent, '涓婁紶涓細' + percent + '%'); + } + }; + xhr.onreadystatechange = function () { + if (xhr.readyState !== 4) return; + if (xhr.status < 200 || xhr.status >= 300) { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + return; + } + var res; + try { res = JSON.parse(xhr.responseText || '{}'); } catch (e) { res = { success: false, error: '杩斿洖鏍煎紡閿欒' }; } + if (!res.success) { + msgEl.textContent = res.error || '鍒犻櫎澶辫触'; + msgEl.className = 'msg err'; + return; + } + setDedupeDeleteImportProgress(100, '涓婁紶瀹屾垚锛屽悗绔鐞嗕腑...'); + pollDedupeDeleteImport(res.import_id); + fileInput.value = ''; + }; + xhr.onerror = function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }; + xhr.send(formData); + }; + document.getElementById('btnSaveDedupeTotalData').onclick = function () { + var itemId = document.getElementById('editDedupeTotalDataId').value; + var value = (document.getElementById('editDedupeTotalDataValue').value || '').trim(); + var msgEl = document.getElementById('msgEditDedupeTotalData'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!value) { + msgEl.textContent = '璇峰～鍐欐€绘暟鎹€?; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/dedupe-total-data/' + itemId, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ data_value: value }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editDedupeTotalDataModal').classList.remove('show'); + loadDedupeTotalData(dedupeTotalDataPage); + } else { + msgEl.textContent = res.error || '淇濆瓨澶辫触'; + msgEl.classList.add('err'); + } + }); + }; + document.getElementById('btnCloseEditDedupeTotalData').onclick = function () { + document.getElementById('editDedupeTotalDataModal').classList.remove('show'); + }; + + // ========== 搴楅摵瀵嗛挜绠＄悊 ========== + var shopKeyPage = 1, shopKeyPageSize = 15; + function buildShopKeyQuery(page) { + return 'page=' + (page || 1) + '&page_size=' + shopKeyPageSize; + } + function loadShopKeys(page) { + shopKeyPage = page || 1; + fetch('/api/admin/shop-keys?' + buildShopKeyQuery(shopKeyPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('shopKeyListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '鏆傛棤搴楅摵瀵嗛挜'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (shopKeyPage - 1) * shopKeyPageSize + index + 1; + return '' + rowNo + '' + (item.ziniao_account_name || '') + '' + (item.ziniao_token || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('shopKeyPagination', res.total, res.page, res.page_size, loadShopKeys); + bindShopKeyActions(); + }) + .catch(function () { + document.getElementById('shopKeyListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + function bindShopKeyActions() { + document.querySelectorAll('[data-shop-key-edit]').forEach(function (btn) { + btn.onclick = function () { + var item = {}; + try { item = JSON.parse((btn.dataset.shopKey || '').replace(/"/g, '"')); } catch (e) { item = {}; } + document.getElementById('editShopKeyId').value = item.id || ''; + document.getElementById('editShopKeyZiniaoAccountName').value = item.ziniao_account_name || ''; + document.getElementById('editShopKeyZiniaoToken').value = item.ziniao_token || ''; + document.getElementById('msgEditShopKey').textContent = ''; + document.getElementById('msgEditShopKey').className = 'msg'; + document.getElementById('editShopKeyModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-shop-key-delete]').forEach(function (btn) { + btn.onclick = function () { + var name = (btn.dataset.ziniaoAccountName || '').replace(/"/g, '"'); + if (!confirm('纭畾鍒犻櫎搴楅摵瀵嗛挜鈥? + name + '鈥濆悧锛?)) return; + fetch('/api/admin/shop-key/' + btn.dataset.shopKeyDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadShopKeys(shopKeyPage); } + else { alert(res.error || '鍒犻櫎澶辫触'); } + }); + }; + }); + } + document.getElementById('btnCreateShopKey').onclick = function () { + var ziniaoAccountName = (document.getElementById('shopKeyZiniaoAccountName').value || '').trim(); + var ziniaoToken = (document.getElementById('shopKeyZiniaoToken').value || '').trim(); + var msgEl = document.getElementById('msgShopKey'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!ziniaoAccountName || !ziniaoToken) { + msgEl.textContent = '璇峰畬鏁村～鍐欑传楦熻处鍙峰悕绉般€佺传楦熶护鐗?; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-key', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + ziniao_account_name: ziniaoAccountName, + ziniao_token: ziniaoToken + }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('shopKeyZiniaoAccountName').value = ''; + document.getElementById('shopKeyZiniaoToken').value = ''; + msgEl.textContent = res.msg || '鍒涘缓鎴愬姛'; + msgEl.className = 'msg ok'; + loadShopKeys(1); + } else { + msgEl.textContent = res.error || '鍒涘缓澶辫触'; + msgEl.className = 'msg err'; + } + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }); + }; + document.getElementById('btnSaveShopKey').onclick = function () { + var itemId = document.getElementById('editShopKeyId').value; + var ziniaoAccountName = (document.getElementById('editShopKeyZiniaoAccountName').value || '').trim(); + var ziniaoToken = (document.getElementById('editShopKeyZiniaoToken').value || '').trim(); + var msgEl = document.getElementById('msgEditShopKey'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!ziniaoAccountName || !ziniaoToken) { + msgEl.textContent = '璇峰畬鏁村～鍐欑传楦熻处鍙峰悕绉般€佺传楦熶护鐗?; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-key/' + itemId, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + ziniao_account_name: ziniaoAccountName, + ziniao_token: ziniaoToken + }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editShopKeyModal').classList.remove('show'); + loadShopKeys(shopKeyPage); + } else { + msgEl.textContent = res.error || '淇濆瓨澶辫触'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.classList.add('err'); + }); + }; + document.getElementById('btnCloseEditShopKey').onclick = function () { + document.getElementById('editShopKeyModal').classList.remove('show'); + }; + + // ========== 搴楅摵绠＄悊 ========== + var shopManagePage = 1, shopManagePageSize = 15; + var shopManageGroups = []; + + function buildShopManageQuery(page) { + var query = 'page=' + (page || 1) + '&page_size=' + shopManagePageSize; + var groupId = (document.getElementById('shopManageFilterGroupId').value || '').trim(); + var shopName = (document.getElementById('shopManageFilterShopName').value || '').trim(); + if (groupId) query += '&group_id=' + encodeURIComponent(groupId); + if (shopName) query += '&shop_name=' + encodeURIComponent(shopName); + return query; + } + + function refreshShopGroupSelects(selectedCreateId, selectedEditId) { + var createSel = document.getElementById('shopManageGroupSelect'); + var editSel = document.getElementById('editShopManageGroupSelect'); + var filterSel = document.getElementById('shopManageFilterGroupId'); + var skipCreateSel = document.getElementById('skipPriceAsinGroupSelect'); + var skipFilterSel = document.getElementById('skipPriceAsinFilterGroupId'); + var chooseSkipShopSel = document.getElementById('chooseSkipPriceAsinShopGroupId'); + var selectedFilterId = filterSel ? filterSel.value : ''; + var selectedSkipCreateId = skipCreateSel ? skipCreateSel.value : ''; + var selectedSkipFilterId = skipFilterSel ? skipFilterSel.value : ''; + var selectedChooseSkipShopId = chooseSkipShopSel ? chooseSkipShopSel.value : ''; + var createOpts = ['']; + var filterOpts = ['']; + shopManageGroups.forEach(function (g) { + var option = ''; + createOpts.push(option); + filterOpts.push(option); + }); + createSel.innerHTML = createOpts.join(''); + editSel.innerHTML = createOpts.join(''); + if (skipCreateSel) skipCreateSel.innerHTML = createOpts.join(''); + if (filterSel) filterSel.innerHTML = filterOpts.join(''); + if (skipFilterSel) skipFilterSel.innerHTML = filterOpts.join(''); + if (chooseSkipShopSel) chooseSkipShopSel.innerHTML = filterOpts.join(''); + if (selectedCreateId != null) createSel.value = String(selectedCreateId); + if (selectedEditId != null) editSel.value = String(selectedEditId); + if (filterSel && selectedFilterId) filterSel.value = selectedFilterId; + if (skipCreateSel && selectedSkipCreateId) skipCreateSel.value = selectedSkipCreateId; + if (skipFilterSel && selectedSkipFilterId) skipFilterSel.value = selectedSkipFilterId; + if (chooseSkipShopSel && selectedChooseSkipShopId) chooseSkipShopSel.value = selectedChooseSkipShopId; + } + + function loadShopManageGroups(selectedCreateId, selectedEditId) { + return fetch('/api/admin/shop-manage-groups') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) throw new Error(res.error || '鍔犺浇鍒嗙粍澶辫触'); + shopManageGroups = res.items || []; + refreshShopGroupSelects(selectedCreateId, selectedEditId); + return shopManageGroups; + }) + .catch(function () { + shopManageGroups = []; + refreshShopGroupSelects(); + return []; + }); + } + + function openShopManageGroupModal() { + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + document.getElementById('msgShopManageGroup').textContent = ''; + document.getElementById('msgShopManageGroup').className = 'msg'; + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + document.getElementById('shopManageGroupModal').classList.add('show'); + }); + } + + function renderShopManageGroupRows() { + var tbody = document.getElementById('shopManageGroupListBody'); + if (!shopManageGroups.length) { + tbody.innerHTML = '鏆傛棤鍒嗙粍'; + return; + } + tbody.innerHTML = shopManageGroups.map(function (item, index) { + return '' + (index + 1) + '' + (item.group_name || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + + document.querySelectorAll('[data-shop-group-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('shopManageGroupEditId').value = btn.dataset.shopGroupEdit; + document.getElementById('shopManageGroupInput').value = (btn.dataset.shopGroupName || '').replace(/"/g, '"'); + }; + }); + + document.querySelectorAll('[data-shop-group-delete]').forEach(function (btn) { + btn.onclick = function () { + var gid = btn.dataset.shopGroupDelete; + var gname = (btn.dataset.shopGroupName || '').replace(/"/g, '"'); + if (!confirm('纭畾鍒犻櫎鍒嗙粍鈥? + gname + '鈥濆悧锛?)) return; + fetch('/api/admin/shop-manage-group/' + gid, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + alert(res.error || '鍒犻櫎澶辫触'); + return; + } + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }); + }; + }); + } + + function loadShopManage(page) { + shopManagePage = page || 1; + fetch('/api/admin/shop-manages?' + buildShopManageQuery(shopManagePage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('shopManageListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '鏆傛棤搴楅摵'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (shopManagePage - 1) * shopManagePageSize + index + 1; + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + (item.mall_name || '') + '' + (item.account || '') + '' + (item.password || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + } + renderPagination('shopManagePagination', res.total, res.page, res.page_size, loadShopManage); + bindShopManageActions(); + }) + .catch(function () { + document.getElementById('shopManageListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + + function bindShopManageActions() { + document.querySelectorAll('[data-shop-manage-edit]').forEach(function (btn) { + btn.onclick = function () { + var item = {}; + try { item = JSON.parse((btn.dataset.shopManage || '').replace(/"/g, '"')); } catch (e) { item = {}; } + document.getElementById('editShopManageId').value = item.id || ''; + document.getElementById('editShopManageShopName').value = item.shop_name || ''; + document.getElementById('editShopManageMallName').value = item.mall_name || ''; + document.getElementById('editShopManageAccount').value = item.account || ''; + document.getElementById('editShopManagePassword').value = item.password || ''; + document.getElementById('msgEditShopManage').textContent = ''; + document.getElementById('msgEditShopManage').className = 'msg'; + loadShopManageGroups(null, item.group_id).then(function () { + document.getElementById('editShopManageModal').classList.add('show'); + }); + }; + }); + document.querySelectorAll('[data-shop-manage-delete]').forEach(function (btn) { + btn.onclick = function () { + var name = (btn.dataset.shopManageName || '').replace(/"/g, '"'); + if (!confirm('纭畾鍒犻櫎搴楅摵鈥? + name + '鈥濆悧锛?)) return; + fetch('/api/admin/shop-manage/' + btn.dataset.shopManageDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadShopManage(shopManagePage); } + else { alert(res.error || '鍒犻櫎澶辫触'); } + }); + }; + }); + } + + document.getElementById('btnManageShopGroups').onclick = openShopManageGroupModal; + document.getElementById('btnManageShopGroupsFromEdit').onclick = openShopManageGroupModal; + document.getElementById('btnSearchShopManage').onclick = function () { + loadShopManage(1); + }; + document.getElementById('shopManageFilterShopName').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadShopManage(1); + } + }); + document.getElementById('btnCloseShopManageGroupModal').onclick = function () { + document.getElementById('shopManageGroupModal').classList.remove('show'); + }; + document.getElementById('btnCancelShopManageGroupEdit').onclick = function () { + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + }; + document.getElementById('btnSaveShopManageGroup').onclick = function () { + var editId = (document.getElementById('shopManageGroupEditId').value || '').trim(); + var groupName = (document.getElementById('shopManageGroupInput').value || '').trim(); + var msgEl = document.getElementById('msgShopManageGroup'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupName) { + msgEl.textContent = '璇疯緭鍏ュ垎缁勫悕绉?; + msgEl.className = 'msg err'; + return; + } + var method = editId ? 'PUT' : 'POST'; + var url = editId ? ('/api/admin/shop-manage-group/' + editId) : '/api/admin/shop-manage-group'; + fetch(url, { + method: method, + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_name: groupName }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + msgEl.textContent = res.error || '淇濆瓨澶辫触'; + msgEl.className = 'msg err'; + return; + } + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + msgEl.textContent = res.msg || '淇濆瓨鎴愬姛'; + msgEl.className = 'msg ok'; + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }); + }; + + function refreshShopGroupSelects(selectedCreateId, selectedEditId) { + var createSel = document.getElementById('shopManageGroupSelect'); + var editSel = document.getElementById('editShopManageGroupSelect'); + var filterSel = document.getElementById('shopManageFilterGroupId'); + var skipCreateSel = document.getElementById('skipPriceAsinGroupSelect'); + var skipFilterSel = document.getElementById('skipPriceAsinFilterGroupId'); + var chooseSkipShopSel = document.getElementById('chooseSkipPriceAsinShopGroupId'); + var selectedFilterId = filterSel ? filterSel.value : ''; + var selectedSkipCreateId = skipCreateSel ? skipCreateSel.value : ''; + var selectedSkipFilterId = skipFilterSel ? skipFilterSel.value : ''; + var selectedChooseSkipShopId = chooseSkipShopSel ? chooseSkipShopSel.value : ''; + var createOpts = ['']; + var filterOpts = ['']; + shopManageGroups.forEach(function (g) { + var option = ''; + createOpts.push(option); + filterOpts.push(option); + }); + createSel.innerHTML = createOpts.join(''); + editSel.innerHTML = createOpts.join(''); + if (skipCreateSel) skipCreateSel.innerHTML = createOpts.join(''); + if (filterSel) filterSel.innerHTML = filterOpts.join(''); + if (skipFilterSel) skipFilterSel.innerHTML = filterOpts.join(''); + if (chooseSkipShopSel) chooseSkipShopSel.innerHTML = filterOpts.join(''); + if (selectedCreateId != null) createSel.value = String(selectedCreateId); + if (selectedEditId != null) editSel.value = String(selectedEditId); + if (filterSel && selectedFilterId) filterSel.value = selectedFilterId; + if (skipCreateSel && selectedSkipCreateId) skipCreateSel.value = selectedSkipCreateId; + if (skipFilterSel && selectedSkipFilterId) skipFilterSel.value = selectedSkipFilterId; + if (chooseSkipShopSel && selectedChooseSkipShopId) chooseSkipShopSel.value = selectedChooseSkipShopId; + } + + function loadShopManageGroups(selectedCreateId, selectedEditId) { + return fetch('/api/admin/shop-manage-groups') + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) throw new Error(res.error || '鍔犺浇鍒嗙粍澶辫触'); + shopManageGroups = res.items || []; + refreshShopGroupSelects(selectedCreateId, selectedEditId); + return shopManageGroups; + }) + .catch(function () { + shopManageGroups = []; + refreshShopGroupSelects(); + return []; + }); + } + + function resetShopManageGroupForm() { + document.getElementById('shopManageGroupEditId').value = ''; + document.getElementById('shopManageGroupInput').value = ''; + document.getElementById('msgShopManageGroup').textContent = ''; + document.getElementById('msgShopManageGroup').className = 'msg'; + refreshShopManageGroupUserSelect(''); + } + + function openShopManageGroupModal() { + resetShopManageGroupForm(); + loadUserOptions() + .then(function () { return loadShopManageGroups(); }) + .then(function () { + renderShopManageGroupRows(); + document.getElementById('shopManageGroupModal').classList.add('show'); + }); + } + + function renderShopManageGroupRows() { + var tbody = document.getElementById('shopManageGroupListBody'); + if (!shopManageGroups.length) { + tbody.innerHTML = '鏆傛棤鍒嗙粍'; + return; + } + tbody.innerHTML = shopManageGroups.map(function (item, index) { + return '' + (index + 1) + '' + (item.group_name || '') + '' + (item.username || '') + '' + (item.created_at || '') + '' + (item.updated_at || '') + '' + + ' ' + + '' + + ''; + }).join(''); + + document.querySelectorAll('[data-shop-group-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('shopManageGroupEditId').value = btn.dataset.shopGroupEdit; + refreshShopManageGroupUserSelect(btn.dataset.shopGroupUserId || ''); + }; + }); + + document.querySelectorAll('[data-shop-group-delete]').forEach(function (btn) { + btn.onclick = function () { + var gid = btn.dataset.shopGroupDelete; + var gname = (btn.dataset.shopGroupName || '').replace(/"/g, '"'); + if (!confirm('纭畾鍒犻櫎鍒嗙粍鈥? + gname + '鈥濆悧锛?)) return; + fetch('/api/admin/shop-manage-group/' + gid, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + alert(res.error || '鍒犻櫎澶辫触'); + return; + } + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }); + }; + }); + } + + document.getElementById('shopManageGroupUserSelect').onchange = syncShopManageGroupNameWithUser; + document.getElementById('btnManageShopGroups').onclick = openShopManageGroupModal; + document.getElementById('btnManageShopGroupsFromEdit').onclick = openShopManageGroupModal; + document.getElementById('btnManageSkipPriceAsinGroups').onclick = openShopManageGroupModal; + document.getElementById('btnCloseShopManageGroupModal').onclick = function () { + document.getElementById('shopManageGroupModal').classList.remove('show'); + }; + document.getElementById('btnCancelShopManageGroupEdit').onclick = resetShopManageGroupForm; + document.getElementById('btnSaveShopManageGroup').onclick = function () { + var editId = (document.getElementById('shopManageGroupEditId').value || '').trim(); + var groupName = (document.getElementById('shopManageGroupInput').value || '').trim(); + var userId = (document.getElementById('shopManageGroupUserSelect').value || '').trim(); + var msgEl = document.getElementById('msgShopManageGroup'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!userId || !groupName) { + msgEl.textContent = '璇烽€夋嫨鍏宠仈鐢ㄦ埛'; + msgEl.className = 'msg err'; + return; + } + var method = editId ? 'PUT' : 'POST'; + var url = editId ? ('/api/admin/shop-manage-group/' + editId) : '/api/admin/shop-manage-group'; + fetch(url, { + method: method, + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_name: groupName, user_id: Number(userId) }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + msgEl.textContent = res.error || '淇濆瓨澶辫触'; + msgEl.className = 'msg err'; + return; + } + resetShopManageGroupForm(); + msgEl.textContent = res.msg || '淇濆瓨鎴愬姛'; + msgEl.className = 'msg ok'; + loadShopManageGroups().then(function () { + renderShopManageGroupRows(); + loadShopManage(shopManagePage); + loadSkipPriceAsin(skipPriceAsinPage); + }); + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }); + }; + + document.getElementById('btnCreateShopManage').onclick = function () { + var groupId = (document.getElementById('shopManageGroupSelect').value || '').trim(); + var shopName = (document.getElementById('shopManageShopName').value || '').trim(); + var mallName = (document.getElementById('shopManageMallName').value || '').trim(); + var account = (document.getElementById('shopManageAccount').value || '').trim(); + var password = (document.getElementById('shopManagePassword').value || '').trim(); + var msgEl = document.getElementById('msgShopManage'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupId || !shopName || !mallName || !account || !password) { + msgEl.textContent = '璇峰畬鏁村～鍐欏垎缁勩€佸簵閾哄悕銆佸簵閾哄晢鍩庡悕銆佽处鍙枫€佸瘑鐮?; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-manage', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, mall_name: mallName, account: account, password: password }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('shopManageGroupSelect').value = ''; + document.getElementById('shopManageShopName').value = ''; + document.getElementById('shopManageMallName').value = ''; + document.getElementById('shopManageAccount').value = ''; + document.getElementById('shopManagePassword').value = ''; + msgEl.textContent = res.msg || '鍒涘缓鎴愬姛'; + msgEl.className = 'msg ok'; + loadShopManage(1); + } else { + msgEl.textContent = res.error || '鍒涘缓澶辫触'; + msgEl.className = 'msg err'; + } + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }); + }; + + document.getElementById('btnSaveShopManage').onclick = function () { + var itemId = document.getElementById('editShopManageId').value; + var groupId = (document.getElementById('editShopManageGroupSelect').value || '').trim(); + var shopName = (document.getElementById('editShopManageShopName').value || '').trim(); + var mallName = (document.getElementById('editShopManageMallName').value || '').trim(); + var account = (document.getElementById('editShopManageAccount').value || '').trim(); + var password = (document.getElementById('editShopManagePassword').value || '').trim(); + var msgEl = document.getElementById('msgEditShopManage'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupId || !shopName || !mallName || !account || !password) { + msgEl.textContent = '璇峰畬鏁村～鍐欏垎缁勩€佸簵閾哄悕銆佸簵閾哄晢鍩庡悕銆佽处鍙枫€佸瘑鐮?; + msgEl.classList.add('err'); + return; + } + fetch('/api/admin/shop-manage/' + itemId, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ group_id: Number(groupId), shop_name: shopName, mall_name: mallName, account: account, password: password }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + document.getElementById('editShopManageModal').classList.remove('show'); + loadShopManage(shopManagePage); + } else { + msgEl.textContent = res.error || '淇濆瓨澶辫触'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.classList.add('err'); + }); + }; + document.getElementById('btnCloseEditShopManage').onclick = function () { + document.getElementById('editShopManageModal').classList.remove('show'); + }; + + // ========== 鐗堟湰绠＄悊 ========== + // ========== 璺宠繃璺熶环 ASIN ========== + var skipPriceAsinPage = 1, skipPriceAsinPageSize = 15; + var chooseSkipPriceAsinShopPage = 1, chooseSkipPriceAsinShopPageSize = 10; + var skipPriceCountryColumns = [ + { code: 'DE', field: 'asin_de', label: '寰峰浗' }, + { code: 'UK', field: 'asin_uk', label: '鑻卞浗' }, + { code: 'FR', field: 'asin_fr', label: '娉曞浗' }, + { code: 'IT', field: 'asin_it', label: '鎰忓ぇ鍒? }, + { code: 'ES', field: 'asin_es', label: '瑗跨彮鐗? } + ]; + function buildChooseSkipPriceAsinShopQuery(page) { + var query = 'page=' + (page || 1) + '&page_size=' + chooseSkipPriceAsinShopPageSize; + var groupId = (document.getElementById('chooseSkipPriceAsinShopGroupId').value || '').trim(); + var shopName = (document.getElementById('chooseSkipPriceAsinShopKeyword').value || '').trim(); + if (groupId) query += '&group_id=' + encodeURIComponent(groupId); + if (shopName) query += '&shop_name=' + encodeURIComponent(shopName); + return query; + } + function loadChooseSkipPriceAsinShops(page) { + chooseSkipPriceAsinShopPage = page || 1; + fetch('/api/admin/shop-manages?' + buildChooseSkipPriceAsinShopQuery(chooseSkipPriceAsinShopPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('chooseSkipPriceAsinShopListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (!items.length) { + tbody.innerHTML = '鏆傛棤搴楅摵'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (chooseSkipPriceAsinShopPage - 1) * chooseSkipPriceAsinShopPageSize + index + 1; + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + (item.mall_name || '') + '' + (item.account || '') + '' + + '' + + ''; + }).join(''); + } + renderPagination('chooseSkipPriceAsinShopPagination', res.total, res.page, res.page_size, loadChooseSkipPriceAsinShops); + bindChooseSkipPriceAsinShopActions(); + }) + .catch(function () { + document.getElementById('chooseSkipPriceAsinShopListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + function bindChooseSkipPriceAsinShopActions() { + document.querySelectorAll('[data-choose-skip-price-asin-shop]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('skipPriceAsinShopName').value = (btn.dataset.shopName || '').replace(/"/g, '"'); + if (!document.getElementById('skipPriceAsinGroupSelect').value && btn.dataset.groupId) { + document.getElementById('skipPriceAsinGroupSelect').value = btn.dataset.groupId; + } + document.getElementById('chooseSkipPriceAsinShopModal').classList.remove('show'); + }; + }); + } + function openChooseSkipPriceAsinShopModal() { + var currentGroupId = (document.getElementById('skipPriceAsinGroupSelect').value || '').trim(); + if (currentGroupId) { + document.getElementById('chooseSkipPriceAsinShopGroupId').value = currentGroupId; + } + document.getElementById('chooseSkipPriceAsinShopKeyword').value = (document.getElementById('skipPriceAsinShopName').value || '').trim(); + document.getElementById('chooseSkipPriceAsinShopModal').classList.add('show'); + loadChooseSkipPriceAsinShops(1); + } + function setupSkipPriceAsinShopPicker() { + var input = document.getElementById('skipPriceAsinShopName'); + var button = document.getElementById('btnChooseSkipPriceAsinShop'); + if (!input || !button) return; + var inputParent = input.parentNode; + if (inputParent && inputParent.style && inputParent.style.display === 'flex') return; + var legacyWrap = button.parentNode; + var wrapper = document.createElement('div'); + wrapper.style.display = 'flex'; + wrapper.style.gap = '8px'; + wrapper.style.alignItems = 'center'; + input.parentNode.insertBefore(wrapper, input); + wrapper.appendChild(input); + wrapper.appendChild(button); + button.style.whiteSpace = 'nowrap'; + button.style.marginTop = '0'; + if (legacyWrap && legacyWrap !== wrapper) { + legacyWrap.style.display = 'none'; + } + } + function getSelectedSkipPriceCountries() { + return Array.from(document.getElementById('skipPriceAsinCountries').selectedOptions).map(function (option) { + return option.value; + }); + } + function renderSkipPriceAsinInputs() { + var container = document.getElementById('skipPriceAsinInputs'); + var selectedCountries = getSelectedSkipPriceCountries(); + var existingValues = {}; + container.querySelectorAll('[data-skip-price-country-input]').forEach(function (input) { + existingValues[input.getAttribute('data-skip-price-country-input')] = input.value; + }); + if (!selectedCountries.length) { + container.innerHTML = '
璇烽€夋嫨鍥藉鍚庤緭鍏?ASIN
'; + return; + } + container.innerHTML = selectedCountries.map(function (countryCode) { + var country = skipPriceCountryColumns.find(function (item) { return item.code === countryCode; }); + var label = country ? country.label : countryCode; + var value = existingValues[countryCode] || ''; + return '
' + + '' + label + '' + + '' + + '
'; + }).join(''); + } + function collectSkipPriceAsinMappings(countries) { + var mappings = {}; + for (var i = 0; i < countries.length; i++) { + var countryCode = countries[i]; + var input = document.querySelector('[data-skip-price-country-input="' + countryCode + '"]'); + var asin = input ? (input.value || '').trim().toUpperCase() : ''; + if (!asin) { + var country = skipPriceCountryColumns.find(function (item) { return item.code === countryCode; }); + var label = country ? country.label : countryCode; + throw new Error(label + ' ASIN 涓嶈兘涓虹┖'); + } + mappings[countryCode] = asin; + } + return mappings; + } + function buildSkipPriceAsinQuery(page) { + var query = 'page=' + (page || 1) + '&page_size=' + skipPriceAsinPageSize; + var groupId = (document.getElementById('skipPriceAsinFilterGroupId').value || '').trim(); + var shopName = (document.getElementById('skipPriceAsinFilterShopName').value || '').trim(); + var asin = (document.getElementById('skipPriceAsinFilterAsin').value || '').trim(); + if (groupId) query += '&group_id=' + encodeURIComponent(groupId); + if (shopName) query += '&shop_name=' + encodeURIComponent(shopName); + if (asin) query += '&asin=' + encodeURIComponent(asin); + return query; + } + function renderSkipPriceAsinCell(item, country) { + var value = item[country.field] || ''; + if (!value) return '-'; + return '
' + + '' + value + '' + + '' + + '' + + '
'; + } + function bindSkipPriceAsinActions() { + document.querySelectorAll('[data-skip-price-asin-edit]').forEach(function (btn) { + btn.onclick = function () { + var shopName = (btn.dataset.shopName || '').replace(/"/g, '"'); + var countryCode = btn.dataset.country || ''; + var currentAsin = (btn.dataset.asin || '').replace(/"/g, '"'); + var nextAsin = prompt('璇疯緭鍏ュ簵閾衡€? + shopName + '鈥濆湪 ' + countryCode + ' 鐨?ASIN', currentAsin); + if (nextAsin === null) return; + nextAsin = (nextAsin || '').trim(); + if (!nextAsin) { + alert('ASIN 涓嶈兘涓虹┖'); + return; + } + fetch('/api/admin/skip-price-asin/' + btn.dataset.skipPriceAsinEdit + '/country/' + countryCode, { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ asin: nextAsin }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) loadSkipPriceAsin(skipPriceAsinPage); + else alert(res.error || '淇濆瓨澶辫触'); + }); + }; + }); + document.querySelectorAll('[data-skip-price-asin-delete]').forEach(function (btn) { + btn.onclick = function () { + var shopName = (btn.dataset.shopName || '').replace(/"/g, '"'); + var countryCode = btn.dataset.country || ''; + if (!confirm('纭畾鍒犻櫎搴楅摵鈥? + shopName + '鈥濆湪 ' + countryCode + ' 鐨?ASIN 鍚楋紵')) return; + fetch('/api/admin/skip-price-asin/' + btn.dataset.skipPriceAsinDelete + '/country/' + countryCode, { + method: 'DELETE' + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) loadSkipPriceAsin(skipPriceAsinPage); + else alert(res.error || '鍒犻櫎澶辫触'); + }); + }; + }); + } + function loadSkipPriceAsin(page) { + skipPriceAsinPage = page || 1; + fetch('/api/admin/skip-price-asins?' + buildSkipPriceAsinQuery(skipPriceAsinPage)) + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('skipPriceAsinListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '鏆傛棤鏁版嵁'; + } else { + tbody.innerHTML = items.map(function (item, index) { + var rowNo = (skipPriceAsinPage - 1) * skipPriceAsinPageSize + index + 1; + return '' + rowNo + '' + (item.group_name || '') + '' + (item.shop_name || '') + '' + + skipPriceCountryColumns.map(function (country) { + return '' + renderSkipPriceAsinCell(item, country) + ''; + }).join('') + + ''; + }).join(''); + } + renderPagination('skipPriceAsinPagination', res.total, res.page, res.page_size, loadSkipPriceAsin); + bindSkipPriceAsinActions(); + }) + .catch(function () { + document.getElementById('skipPriceAsinListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + document.getElementById('btnManageSkipPriceAsinGroups').onclick = openShopManageGroupModal; + document.getElementById('btnChooseSkipPriceAsinShop').onclick = openChooseSkipPriceAsinShopModal; + document.getElementById('btnSearchChooseSkipPriceAsinShop').onclick = function () { + loadChooseSkipPriceAsinShops(1); + }; + document.getElementById('chooseSkipPriceAsinShopGroupId').onchange = function () { + loadChooseSkipPriceAsinShops(1); + }; + document.getElementById('chooseSkipPriceAsinShopKeyword').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadChooseSkipPriceAsinShops(1); + } + }); + document.getElementById('btnCloseChooseSkipPriceAsinShopModal').onclick = function () { + document.getElementById('chooseSkipPriceAsinShopModal').classList.remove('show'); + }; + document.getElementById('skipPriceAsinCountries').addEventListener('change', renderSkipPriceAsinInputs); + document.getElementById('btnSearchSkipPriceAsin').onclick = function () { + loadSkipPriceAsin(1); + }; + document.getElementById('skipPriceAsinFilterShopName').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadSkipPriceAsin(1); + } + }); + document.getElementById('skipPriceAsinFilterAsin').addEventListener('keydown', function (e) { + if (e.key === 'Enter') { + e.preventDefault(); + loadSkipPriceAsin(1); + } + }); + document.getElementById('btnCreateSkipPriceAsin').onclick = function () { + var groupId = (document.getElementById('skipPriceAsinGroupSelect').value || '').trim(); + var shopName = (document.getElementById('skipPriceAsinShopName').value || '').trim(); + var countries = getSelectedSkipPriceCountries(); + var msgEl = document.getElementById('msgSkipPriceAsin'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!groupId || !shopName || !countries.length) { + msgEl.textContent = '璇峰畬鏁村～鍐欏垎缁勩€佸簵閾哄悕銆佸浗瀹跺拰 ASIN'; + msgEl.className = 'msg err'; + return; + } + var asinMappings = {}; + try { + asinMappings = collectSkipPriceAsinMappings(countries); + } catch (err) { + msgEl.textContent = err.message || '璇疯緭鍏?ASIN'; + msgEl.className = 'msg err'; + return; + } + var fallbackAsin = ''; + Object.keys(asinMappings).some(function (countryCode) { + fallbackAsin = asinMappings[countryCode] || ''; + return !!fallbackAsin; + }); + fetch('/api/admin/skip-price-asin', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + group_id: Number(groupId), + shop_name: shopName, + countries: countries, + asin: fallbackAsin, + asin_mappings: asinMappings + }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (!res.success) { + msgEl.textContent = res.error || '淇濆瓨澶辫触'; + msgEl.className = 'msg err'; + return; + } + document.getElementById('skipPriceAsinGroupSelect').value = ''; + document.getElementById('skipPriceAsinShopName').value = ''; + Array.from(document.getElementById('skipPriceAsinCountries').options).forEach(function (option) { + option.selected = false; + }); + renderSkipPriceAsinInputs(); + msgEl.textContent = res.msg || '淇濆瓨鎴愬姛'; + msgEl.className = 'msg ok'; + loadSkipPriceAsin(1); + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.className = 'msg err'; + }); + }; + setupSkipPriceAsinShopPicker(); + renderSkipPriceAsinInputs(); + function loadVersions() { + fetch('/api/admin/versions') + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('versionListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + var items = res.items || []; + if (items.length === 0) { + tbody.innerHTML = '鏆傛棤鐗堟湰璁板綍'; + } else { + tbody.innerHTML = items.map(function (v) { + var url = (v.file_url || '').replace(/"/g, '"'); + return '' + (v.version || '') + '' + url + '' + (v.created_at || '') + '涓嬭浇'; + }).join(''); + } + }) + .catch(function () { + document.getElementById('versionListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + document.getElementById('btnUploadVersion').onclick = function () { + var version = (document.getElementById('versionNumber').value || '').trim(); + var fileInput = document.getElementById('versionZip'); + var msgEl = document.getElementById('msgVersion'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!version) { + msgEl.textContent = '璇峰～鍐欑増鏈彿'; + msgEl.classList.add('err'); + return; + } + if (!fileInput.files || fileInput.files.length === 0) { + msgEl.textContent = '璇烽€夋嫨 zip 鍘嬬缉鍖?; + msgEl.classList.add('err'); + return; + } + var file = fileInput.files[0]; + if (!(file.name || '').toLowerCase().endsWith('.zip')) { + msgEl.textContent = '浠呮敮鎸?.zip 鏍煎紡'; + msgEl.classList.add('err'); + return; + } + var formData = new FormData(); + formData.append('version', version); + formData.append('file', file); + msgEl.textContent = '涓婁紶涓?..'; + msgEl.classList.remove('err', 'ok'); + fetch('/api/admin/version', { + method: 'POST', + body: formData + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = '鍙戝竷鎴愬姛銆傜増鏈細' + res.version + '锛岄摼鎺ワ細' + (res.file_url || ''); + msgEl.classList.add('ok'); + document.getElementById('versionNumber').value = ''; + fileInput.value = ''; + loadVersions(); + } else { + msgEl.textContent = res.error || '涓婁紶澶辫触'; + msgEl.classList.add('err'); + } + }) + .catch(function () { + msgEl.textContent = '璇锋眰澶辫触'; + msgEl.classList.add('err'); + }); + }; + + // ========== 鏍忕洰鏉冮檺閰嶇疆 ========== + function loadColumns() { + fetch('/api/admin/columns') + .then(function (r) { return r.json(); }) + .then(function (res) { + var tbody = document.getElementById('columnListBody'); + if (!res.success) { + tbody.innerHTML = '鍔犺浇澶辫触: ' + (res.error || '') + ''; + return; + } + allColumnsList = res.items || []; + if (allColumnsList.length === 0) { + tbody.innerHTML = '鏆傛棤鑿滃崟锛岃鍦ㄤ笂鏂规柊澧?/td>'; + } else { + tbody.innerHTML = allColumnsList.map(function (c) { + return '' + c.id + '' + (c.name || '') + '' + (c.column_key || '') + '' + (c.created_at || '') + '' + + ' ' + + ''; + }).join(''); + } + bindColumnActions(); + }) + .catch(function () { + document.getElementById('columnListBody').innerHTML = '璇锋眰澶辫触'; + }); + } + function bindColumnActions() { + document.querySelectorAll('[data-column-edit]').forEach(function (btn) { + btn.onclick = function () { + document.getElementById('editColumnId').value = btn.dataset.columnEdit || ''; + document.getElementById('editColumnName').value = (btn.dataset.name || '').replace(/"/g, '"'); + document.getElementById('editColumnKey').value = (btn.dataset.key || '').replace(/"/g, '"'); + document.getElementById('msgEditColumn').textContent = ''; + document.getElementById('editColumnModal').classList.add('show'); + }; + }); + document.querySelectorAll('[data-column-delete]').forEach(function (btn) { + btn.onclick = function () { + if (!confirm('纭畾鍒犻櫎鑿滃崟鈥? + (btn.dataset.name || '').replace(/"/g, '"') + '鈥濆悧锛?)) return; + fetch('/api/admin/column/' + btn.dataset.columnDelete, { method: 'DELETE' }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { loadColumns(); loadColumnsForPermission(); loadAdminMenus(getActiveAdminTabName()); } + else { alert(res.error || '鍒犻櫎澶辫触'); } + }); + }; + }); + } + document.getElementById('btnAddColumn').onclick = function () { + var name = (document.getElementById('columnName').value || '').trim(); + var key = (document.getElementById('columnKey').value || '').trim(); + var msgEl = document.getElementById('msgColumn'); + msgEl.textContent = ''; + msgEl.className = 'msg'; + if (!name) { msgEl.textContent = '璇峰～鍐欒彍鍗曞悕绉?; msgEl.classList.add('err'); return; } + if (!key) { + msgEl.textContent = '璇峰～鍐欐爮鐩爣璇?; msgEl.classList.add('err'); return; + } + fetch('/api/admin/column', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name: name, column_key: key }) + }) + .then(function (r) { return r.json(); }) + .then(function (res) { + if (res.success) { + msgEl.textContent = res.msg || '鏂板鎴愬姛'; + msgEl.classList.add('ok'); + document.getElementById('columnName').value = ''; + document.getElementById('columnKey').value = ''; + loadColumns(); + loadColumnsForPermission(); + loadAdminMenus(getActiveAdminTabName()); + } else { diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 1fc9406..82837a5 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -1,20 +1,85 @@ - + + 管理后台 - 南日AI + - +

管理后台

-
+
+ 加载中... + + +
+ +
用户管理
栏目权限配置
数据去重总数据
@@ -120,22 +414,23 @@
-
+

创建用户

-

无注册入口，仅管理员可在此创建用户。层级：超级管理员 → 管理员 → 普通号。

+

+ 当前没有开放注册入口，仅管理员可在此创建用户。层级关系：超级管理员 -> 管理员 -> 普通账号。

- +
- +
@@ -146,7 +441,7 @@
- +
@@ -189,21 +484,32 @@
-

新增栏目

+

新增菜单

- - + +
-
+
- +
- +
+ + +
+
+ + +
+

@@ -213,8 +519,10 @@ ID - 栏目名 + 菜单名称 栏目标识 + 菜单类型 + 排序 菜单路由 创建时间 操作 @@ -271,7 +579,9 @@

@@ -286,7 +596,9 @@

@@ -299,7 +611,7 @@
- + @@ -325,11 +637,11 @@ -
+
- +

@@ -370,7 +682,7 @@ -
+
@@ -378,11 +690,11 @@
-
+
- +

@@ -439,8 +751,12 @@ -
+
+
+ + +
-
+
- +
+
请选择国家后输入对应 ASIN
+
@@ -544,13 +862,13 @@
- +
@@ -559,7 +877,7 @@
- +
@@ -580,7 +898,7 @@ -

+

@@ -594,10 +912,10 @@

编辑栏目

- - + +
-
+
@@ -605,6 +923,17 @@
+
+ + +
+
+ + +

@@ -619,9 +948,16 @@

分组管理

+
+ + +
- +
@@ -629,7 +965,14 @@

- + + + + + + + +
序号分组名称创建时间修改时间操作
序号分组名称关联用户创建时间修改时间操作
@@ -640,6 +983,44 @@ + +