From 7589b4e418174b9c55d9df458199f523edbaa2a0 Mon Sep 17 00:00:00 2001 From: super <2903208875@qq.com> Date: Sat, 11 Apr 2026 22:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug=E4=BF=AE=E5=A4=8D=20=20?= =?UTF-8?q?=20=E5=90=8E=E5=8F=B0=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.env | 1 - app/__pycache__/app_common.cpython-312.pyc | Bin 15390 -> 15390 bytes .../__pycache__/match_action.cpython-312.pyc | Bin 32650 -> 32575 bytes .../__pycache__/admin.cpython-312.pyc | Bin 20140 -> 20140 bytes .../exception/GlobalExceptionHandler.java | 2 +- .../service/DeleteBrandRunService.java | 29 +- .../service/DeleteBrandStaleTaskService.java | 22 +- .../controller/PermissionMenuController.java | 83 ++++++ .../permission/mapper/AdminUserMapper.java | 9 + .../mapper/PermissionMenuMapper.java | 9 + .../mapper/UserColumnPermissionMapper.java | 9 + .../dto/PermissionMenuCreateRequest.java | 20 ++ .../dto/PermissionMenuUpdateRequest.java | 20 ++ .../UserColumnPermissionUpdateRequest.java | 11 + .../model/entity/AdminUserEntity.java | 15 ++ .../model/entity/PermissionMenuEntity.java | 21 ++ .../entity/UserColumnPermissionEntity.java | 16 ++ .../model/vo/PermissionMenuItemVo.java | 16 ++ .../permission/model/vo/UserColumnIdsVo.java | 11 + .../PermissionMenuSchemaInitializer.java | 55 ++++ .../service/PermissionMenuService.java | 253 ++++++++++++++++++ .../ProductRiskResolveController.java | 171 +++--------- .../service/ProductRiskTaskService.java | 18 ++ .../service/ShopMatchTaskService.java | 110 ++++---- ...__columns_add_menu_type_and_route_path.sql | 9 + backend/__pycache__/config.cpython-312.pyc | Bin 1510 -> 1513 bytes .../__pycache__/admin_api.cpython-312.pyc | Bin 56973 -> 55940 bytes backend/blueprints/admin_api.py | 225 ++++++++-------- backend/config.py | 4 +- backend/utils/__pycache__/db.cpython-312.pyc | Bin 7467 -> 8233 bytes backend/utils/db.py | 12 + backend/web_source/admin.html | 49 ++++ .../brand/components/BrandDeleteBrandTab.vue | 26 +- .../brand/components/BrandShopMatchTab.vue | 63 +++-- .../pages/brand/components/BrandTopBar.vue | 19 +- frontend-vue/src/shared/api/java-modules.ts | 7 +- 36 files changed, 956 insertions(+), 359 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/AdminUserMapper.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/PermissionMenuMapper.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/UserColumnPermissionMapper.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuCreateRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuUpdateRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/UserColumnPermissionUpdateRequest.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/PermissionMenuEntity.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/UserColumnPermissionEntity.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/UserColumnIdsVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java create mode 100644 backend-java/src/main/resources/db/V20__columns_add_menu_type_and_route_path.sql diff --git a/app/.env b/app/.env index 4748534..a8104b3 100644 --- a/app/.env +++ b/app/.env @@ -14,7 +14,6 @@ client_name=ShuFuAI # java_api_base=http://47.111.163.154:18080 java_api_base=http://127.0.0.1:18080 -# java_api_base=http://8.136.19.173:18081 # java_api_base=http://8.136.19.173:18080 diff --git a/app/__pycache__/app_common.cpython-312.pyc b/app/__pycache__/app_common.cpython-312.pyc index 92c7675cb5c7a8f1b9327c4a01bf83b891b84e15..eac4be7d29aabe5fd7d14f346be32d034f2750db 100644 GIT binary patch delta 20 acmbPNF|UIAG%qg~0}yPIzO|8C*aiSY-38eI delta 20 acmbPNF|UIAG%qg~0}wn&-Mf)n*aiSbN(M9l diff --git a/app/amazon/__pycache__/match_action.cpython-312.pyc b/app/amazon/__pycache__/match_action.cpython-312.pyc index c770364f28c0f159252f50cecca50ba9cc2b0bf6..4aa5da09ade3c787e158b33ba66225b575a89813 100644 GIT binary patch delta 693 zcmeDB&$#~|BkyTmUM>b8$kV==nYfX6a*51MAn)nyc~AB%c)FzJ`GmITyC*-JH|J@` z2FC!;$%>|$lRuQOOgQc) zv)*-+CzNTXAp{{NSt%6V0-10dWP%7>2SoB&$AqU{^Q{!Bm=$ytN)^y#pDx+>V$0I^ zdwQOOz4m-TBhauGprR^OpxYHE2b8l!mkI*;FE%tkpRxiNL{IlLJ>9VbsHzAkTC@R3 zl!C(I>Gn-8_U!|P;b8kY&7?xqBn;UzGX z@!6y;&l@{m_D*^}vn{}LvZARbZ)S>>!n3UlUaa5rbouHtWyzFXw*0Sd5hIKEeZFst^8LakWnMg{hB2e-3#{OsfyPnTj4|h7;#R?kF zcTcx3@&KwTnhGRJS%HMY(-m#@rF=jZTtjG(kCj5H2(r-2{>JB>9Z$D5P7W{AtVfZ8 z8*imhbPK4b=r)ijl?4)T8Mw(W`?i2wzI?WoLKU-uu0p9kR%O7zc(HHwi{;B+PMQ65 zQ^V8cJ6`s!d9rsGFtC7@v`l_jrtK{b(mAR7Y1^u2Q@)wNvCi_>E z`uJZF2)H32GM!^0#|3Gd9iayTcSi2;K2Uf<`ULNV(5MTN(N_dwpbBQ#tx#SedO=eE zihu!JkNyVs6_pnxEw2bzP3EgK6ucmr??&Dg^%o@VuLw9yW-PEbve^-`!|j0b zfwTh=7i9gei1^ handleException(Exception ex) { log.error("Unhandled exception", ex); - return ApiResponse.fail("服务异常：" + ex.getMessage()); + return ApiResponse.fail("服务异常: " + ex.getMessage()); } } 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 54965c6..c080b5d 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 @@ -127,7 +127,7 @@ public class DeleteBrandRunService { ZiniaoShopMatchResultVo matchResult = normalizedShopName.isBlank() ? ziniaoShopSwitchService.emptyMatchResult() : storeMatchByShopName.computeIfAbsent(normalizedShopName, - ignored -> ziniaoShopSwitchService.findIndexedStoreByName(item.getShopName())); + ignored -> ziniaoShopSwitchService.findIndexedStoreByName(item.getShopName(), false)); item.setMatchStatus(matchResult.getMatchStatus()); item.setMatchMessage(matchResult.getMatchMessage()); item.setMatched(matchResult.isMatched()); @@ -714,7 +714,7 @@ public class DeleteBrandRunService { unmatchedCount++; continue; } - ZiniaoShopMatchResultVo refreshed = ziniaoShopSwitchService.findIndexedStoreByName(item.getShopName()); + ZiniaoShopMatchResultVo refreshed = ziniaoShopSwitchService.findIndexedStoreByName(item.getShopName(), false); if (refreshed != null) { String oldStatus = item.getMatchStatus(); boolean oldMatched = item.isMatched(); @@ -990,6 +990,26 @@ public class DeleteBrandRunService { Map> mergedByFile = loadMergedChunks(taskId); int finishedFiles = countCompletedFiles(mergedByFile); + if (finishedFiles < expectedFiles) { + Map progress = new LinkedHashMap<>(); + progress.put("finished_files", String.valueOf(finishedFiles)); + // 定时补偿只负责“再试一次 finalize”，不能把缺片任务重新续命， + // 否则 stale-check 永远看不到超时任务。 + if (!fromCompensation) { + progress.put("updated_at", String.valueOf(System.currentTimeMillis())); + } + deleteBrandTaskCacheService.saveProgress(taskId, progress); + + task.setSuccessFileCount(finishedFiles); + if (!fromCompensation) { + task.setUpdatedAt(LocalDateTime.now()); + } + fileTaskMapper.updateById(task); + + log.info("[DeleteBrand] tryFinalizeTask skipping -> finishedFiles ({}) < expectedFiles ({})", finishedFiles, expectedFiles); + return; + } + Map progress = new LinkedHashMap<>(); progress.put("finished_files", String.valueOf(finishedFiles)); progress.put("updated_at", String.valueOf(System.currentTimeMillis())); @@ -1001,11 +1021,6 @@ public class DeleteBrandRunService { task.setSuccessFileCount(finishedFiles); task.setUpdatedAt(LocalDateTime.now()); fileTaskMapper.updateById(task); - - if (finishedFiles < expectedFiles) { - log.info("[DeleteBrand] tryFinalizeTask skipping -> finishedFiles ({}) < expectedFiles ({})", finishedFiles, expectedFiles); - return; - } log.info("[DeleteBrand] tryFinalizeTask calling finalizeTask -> finishedFiles: {}, expectedFiles: {}", finishedFiles, expectedFiles); 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 2623dfc..afd8b27 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 @@ -20,7 +20,8 @@ import java.time.ZoneId; import java.util.Map; /** - * 鍒犻櫎鍝佺墝浠诲姟鐨勮秴鏃跺洖鏀朵笌 finalize 琛ュ伩锛涘苟涓庡垹闄ゅ搧鐗屽叡鐢ㄥ悓涓€濂楀畾鏃惰皟搴︼紝瀵瑰晢鍝侀闄╋紙PRODUCT_RISK_RESOLVE锛夐暱鏃堕棿鏃犲洖浼犲仛澶辫触鏀跺熬銆? + * 删除品牌任务的超时回收与 finalize 补偿。 + * 同时复用这套定时调度，对商品风险和匹配店铺任务做超时兜底收尾。 */ @Service @RequiredArgsConstructor @@ -66,7 +67,7 @@ public class DeleteBrandStaleTaskService { private void failStaleDeleteBrandTasks() { LocalDateTime threshold = LocalDateTime.now().minusMinutes(deleteBrandProgressProperties.getHeartbeatTimeoutMinutes()); - // 鍏堟寜 DB updatedAt 绮楃瓫锛岄伩鍏嶅叏琛ㄦ壂鎻? + // 先按 DB updatedAt 粗筛，避免全表扫描。 java.util.List runningTasks = fileTaskMapper.selectList(new LambdaQueryWrapper() .eq(FileTaskEntity::getModuleType, MODULE_TYPE_DELETE_BRAND) .eq(FileTaskEntity::getStatus, "RUNNING") @@ -96,19 +97,17 @@ public class DeleteBrandStaleTaskService { } LocalDateTime lastActivityTime; - // 鍙湁褰?has_progress 涓?true 涓旇秴杩?15 鍒嗛挓娌″績璺筹紝鎵嶈涓烘槸寮傚父鍗℃ + // 只有 has_progress=true 且心跳超时，才判定为异常卡住。 if (lastHeartbeatAt > 0 && isActive) { - // 鏈夊績璺筹紝鐢ㄦ渶鍚庡績璺虫椂闂村姣?15 鍒嗛挓 (threshold 鏄?now - 15) lastActivityTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(lastHeartbeatAt), ZoneId.systemDefault()); if (lastActivityTime.isAfter(threshold)) { - continue; // 娌¤秴鏃? + continue; } } else { - // 娌℃湁蹇冭烦锛屾垨鑰呭綋鍓嶅鍦?has_progress: false 锛堢瓑寰呯敤鎴风偣鍑讳笅涓€涓换鍔℃帹閫佺殑闈欓粯鏈燂級 - // 闈欓粯鏈熷拰鎺掗槦鏈熺殑瀹介檺鏈熶竴鏍凤紝璁句负 12 涓皬鏃? + // 没有心跳，或仍处于静默等待阶段时，使用更长的初始宽限期。 LocalDateTime queuedThreshold = LocalDateTime.now().minusHours(12); if (task.getCreatedAt() != null && task.getCreatedAt().isAfter(queuedThreshold)) { - continue; // 绛夊緟涓嬩釜闃熷垪鎺ㄩ€佷腑锛屼笉瑕佹潃瀹冿紒 + continue; } } @@ -117,7 +116,7 @@ public class DeleteBrandStaleTaskService { .eq(FileTaskEntity::getModuleType, MODULE_TYPE_DELETE_BRAND) .eq(FileTaskEntity::getStatus, "RUNNING") .set(FileTaskEntity::getStatus, "FAILED") - .set(FileTaskEntity::getErrorMessage, "缁撴灉鍥炰紶闀挎椂闂存棤鍝嶅簲锛屼换鍔″凡鑷姩澶辫触") + .set(FileTaskEntity::getErrorMessage, "结果回传长时间无响应，任务已自动失败") .set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()) .set(FileTaskEntity::getFinishedAt, LocalDateTime.now())); @@ -170,7 +169,7 @@ public class DeleteBrandStaleTaskService { .eq(FileTaskEntity::getModuleType, MODULE_TYPE_PRODUCT_RISK) .eq(FileTaskEntity::getStatus, "RUNNING") .set(FileTaskEntity::getStatus, "FAILED") - .set(FileTaskEntity::getErrorMessage, "闀挎椂闂存湭鏀跺埌 Python 缁撴灉锛屼换鍔″凡鑷姩澶辫触") + .set(FileTaskEntity::getErrorMessage, "长时间未收到 Python 结果回传，任务已自动失败") .set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()) .set(FileTaskEntity::getFinishedAt, LocalDateTime.now())); if (updated > 0) { @@ -252,7 +251,7 @@ public class DeleteBrandStaleTaskService { try { deleteBrandRunService.tryFinalizeTask(task.getId(), true); } catch (Exception ignored) { - // 瀹氭椂琛ュ伩涓嶅奖鍝嶄富娴佺▼锛涗笅娆¤皟搴︽垨浜哄伐閲嶈瘯鏃跺啀澶勭悊 + // 定时补偿不影响主流程；下次调度或人工重试时再处理。 } } } @@ -271,4 +270,3 @@ public class DeleteBrandStaleTaskService { private int skippedTaskCount; } } - diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java new file mode 100644 index 0000000..6db3afb --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/controller/PermissionMenuController.java @@ -0,0 +1,83 @@ +package com.nanri.aiimage.modules.permission.controller; + +import com.nanri.aiimage.common.api.ApiResponse; +import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateRequest; +import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuUpdateRequest; +import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest; +import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo; +import com.nanri.aiimage.modules.permission.model.vo.UserColumnIdsVo; +import com.nanri.aiimage.modules.permission.service.PermissionMenuService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/admin") +@Tag(name = "菜单权限管理", description = "统一维护软件端与后台管理端的菜单权限配置") +public class PermissionMenuController { + + private final PermissionMenuService permissionMenuService; + + @GetMapping("/permission-menus") + @Operation(summary = "查询菜单权限列表") + public ApiResponse> listMenus( + @Parameter(description = "菜单类型: app/admin") @RequestParam(required = false) String menuType) { + return ApiResponse.success(permissionMenuService.list(menuType)); + } + + @PostMapping("/permission-menus") + @Operation(summary = "新增菜单权限项") + public ApiResponse createMenu(@Valid @RequestBody PermissionMenuCreateRequest request) { + return ApiResponse.success("创建成功", permissionMenuService.create(request)); + } + + @PutMapping("/permission-menus/{id}") + @Operation(summary = "编辑菜单权限项") + public ApiResponse updateMenu(@PathVariable Long id, + @Valid @RequestBody PermissionMenuUpdateRequest request) { + return ApiResponse.success("更新成功", permissionMenuService.update(id, request)); + } + + @DeleteMapping("/permission-menus/{id}") + @Operation(summary = "删除菜单权限项") + public ApiResponse deleteMenu(@PathVariable Long id) { + permissionMenuService.delete(id); + return ApiResponse.success("删除成功", null); + } + + @GetMapping("/permission-users/{userId}/columns") + @Operation(summary = "查询用户菜单权限 ID 列表") + public ApiResponse getUserColumnIds(@PathVariable Long userId, + @RequestParam(required = false) String menuType) { + return ApiResponse.success(permissionMenuService.getUserColumnIds(userId, menuType)); + } + + @PutMapping("/permission-users/{userId}/columns") + @Operation(summary = "更新用户菜单权限") + public ApiResponse updateUserColumnIds(@PathVariable Long userId, + @RequestBody(required = false) UserColumnPermissionUpdateRequest request) { + permissionMenuService.updateUserColumnPermissions(userId, request); + return ApiResponse.success("保存成功", null); + } + + @GetMapping("/permission-users/{userId}/column-permissions") + @Operation(summary = "查询用户菜单权限详情") + public ApiResponse> getUserColumnPermissions(@PathVariable Long userId, + @RequestParam(required = false) String menuType) { + return ApiResponse.success(permissionMenuService.getUserColumnPermissions(userId, menuType)); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/AdminUserMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/AdminUserMapper.java new file mode 100644 index 0000000..4e0c7ef --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/AdminUserMapper.java @@ -0,0 +1,9 @@ +package com.nanri.aiimage.modules.permission.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdminUserMapper extends BaseMapper { +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/PermissionMenuMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/PermissionMenuMapper.java new file mode 100644 index 0000000..0aeb022 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/PermissionMenuMapper.java @@ -0,0 +1,9 @@ +package com.nanri.aiimage.modules.permission.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.permission.model.entity.PermissionMenuEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface PermissionMenuMapper extends BaseMapper { +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/UserColumnPermissionMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/UserColumnPermissionMapper.java new file mode 100644 index 0000000..569af53 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/mapper/UserColumnPermissionMapper.java @@ -0,0 +1,9 @@ +package com.nanri.aiimage.modules.permission.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nanri.aiimage.modules.permission.model.entity.UserColumnPermissionEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserColumnPermissionMapper extends BaseMapper { +} 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 new file mode 100644 index 0000000..b40ab05 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuCreateRequest.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.modules.permission.model.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Data +public class PermissionMenuCreateRequest { + + @NotBlank(message = "菜单名称不能为空") + private String name; + + @NotBlank(message = "菜单标识不能为空") + private String columnKey; + + @NotBlank(message = "菜单类型不能为空") + private String menuType; + + @NotBlank(message = "菜单路由不能为空") + private String routePath; +} 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 new file mode 100644 index 0000000..38ef597 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/PermissionMenuUpdateRequest.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.modules.permission.model.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Data +public class PermissionMenuUpdateRequest { + + @NotBlank(message = "菜单名称不能为空") + private String name; + + @NotBlank(message = "菜单标识不能为空") + private String columnKey; + + @NotBlank(message = "菜单类型不能为空") + private String menuType; + + @NotBlank(message = "菜单路由不能为空") + private String routePath; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/UserColumnPermissionUpdateRequest.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/UserColumnPermissionUpdateRequest.java new file mode 100644 index 0000000..64ea470 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/dto/UserColumnPermissionUpdateRequest.java @@ -0,0 +1,11 @@ +package com.nanri.aiimage.modules.permission.model.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class UserColumnPermissionUpdateRequest { + + private List columnIds; +} 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 new file mode 100644 index 0000000..b3af65b --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/AdminUserEntity.java @@ -0,0 +1,15 @@ +package com.nanri.aiimage.modules.permission.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("users") +public class AdminUserEntity { + + @TableId(type = IdType.AUTO) + private Long id; + private String role; +} 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 new file mode 100644 index 0000000..c8e4262 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/PermissionMenuEntity.java @@ -0,0 +1,21 @@ +package com.nanri.aiimage.modules.permission.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@TableName("columns") +public class PermissionMenuEntity { + + @TableId(type = IdType.AUTO) + private Long id; + private String name; + private String columnKey; + private String menuType; + private String routePath; + private LocalDateTime createdAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/UserColumnPermissionEntity.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/UserColumnPermissionEntity.java new file mode 100644 index 0000000..41108bc --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/entity/UserColumnPermissionEntity.java @@ -0,0 +1,16 @@ +package com.nanri.aiimage.modules.permission.model.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("user_column_permission") +public class UserColumnPermissionEntity { + + @TableField("user_id") + private Long userId; + + @TableField("column_id") + private Long columnId; +} 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 new file mode 100644 index 0000000..875dc87 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/PermissionMenuItemVo.java @@ -0,0 +1,16 @@ +package com.nanri.aiimage.modules.permission.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class PermissionMenuItemVo { + + private Long id; + private String name; + private String columnKey; + private String menuType; + private String routePath; + private LocalDateTime createdAt; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/UserColumnIdsVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/UserColumnIdsVo.java new file mode 100644 index 0000000..9879826 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/model/vo/UserColumnIdsVo.java @@ -0,0 +1,11 @@ +package com.nanri.aiimage.modules.permission.model.vo; + +import lombok.Data; + +import java.util.List; + +@Data +public class UserColumnIdsVo { + + private List columnIds; +} 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 new file mode 100644 index 0000000..bf00c99 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuSchemaInitializer.java @@ -0,0 +1,55 @@ +package com.nanri.aiimage.modules.permission.service; + +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +@Slf4j +public class PermissionMenuSchemaInitializer { + + private final JdbcTemplate jdbcTemplate; + + @PostConstruct + public void initialize() { + 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 '栏目标识', + 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("UPDATE columns SET menu_type = 'app' WHERE menu_type IS NULL OR menu_type = ''"); + 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, + column_id INT NOT NULL, + PRIMARY KEY (user_id, column_id), + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE, + FOREIGN KEY (column_id) REFERENCES columns(id) ON DELETE CASCADE + ) + """); + } + + private void executeQuietly(String sql) { + try { + jdbcTemplate.execute(sql); + } catch (Exception ex) { + log.debug("[permission-menu] schema init skipped: {}", ex.getMessage()); + } + } +} 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 new file mode 100644 index 0000000..a0ef8f0 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/permission/service/PermissionMenuService.java @@ -0,0 +1,253 @@ +package com.nanri.aiimage.modules.permission.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.nanri.aiimage.common.exception.BusinessException; +import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper; +import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper; +import com.nanri.aiimage.modules.permission.mapper.UserColumnPermissionMapper; +import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateRequest; +import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuUpdateRequest; +import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest; +import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity; +import com.nanri.aiimage.modules.permission.model.entity.PermissionMenuEntity; +import com.nanri.aiimage.modules.permission.model.entity.UserColumnPermissionEntity; +import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo; +import com.nanri.aiimage.modules.permission.model.vo.UserColumnIdsVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class PermissionMenuService { + + public static final String MENU_TYPE_APP = "app"; + public static final String MENU_TYPE_ADMIN = "admin"; + + private final PermissionMenuMapper permissionMenuMapper; + private final UserColumnPermissionMapper userColumnPermissionMapper; + private final AdminUserMapper adminUserMapper; + + public List list(String menuType) { + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(isValidMenuType(menuType), PermissionMenuEntity::getMenuType, normalizeMenuType(menuType)) + .orderByAsc(PermissionMenuEntity::getId); + return permissionMenuMapper.selectList(query).stream() + .map(this::toItemVo) + .toList(); + } + + @Transactional + public PermissionMenuItemVo create(PermissionMenuCreateRequest request) { + String name = normalizeRequired(request.getName(), "菜单名称不能为空"); + String columnKey = normalizeRequired(request.getColumnKey(), "菜单标识不能为空"); + String menuType = normalizeMenuTypeRequired(request.getMenuType()); + String routePath = normalizeRequired(request.getRoutePath(), "菜单路由不能为空"); + ensureUniqueColumnKey(columnKey, null); + + PermissionMenuEntity entity = new PermissionMenuEntity(); + entity.setName(name); + entity.setColumnKey(columnKey); + entity.setMenuType(menuType); + entity.setRoutePath(routePath); + permissionMenuMapper.insert(entity); + return toItemVo(getMenuById(entity.getId())); + } + + @Transactional + public PermissionMenuItemVo update(Long id, PermissionMenuUpdateRequest request) { + PermissionMenuEntity entity = getMenuById(id); + String name = normalizeRequired(request.getName(), "菜单名称不能为空"); + String columnKey = normalizeRequired(request.getColumnKey(), "菜单标识不能为空"); + String menuType = normalizeMenuTypeRequired(request.getMenuType()); + String routePath = normalizeRequired(request.getRoutePath(), "菜单路由不能为空"); + ensureUniqueColumnKey(columnKey, id); + + entity.setName(name); + entity.setColumnKey(columnKey); + entity.setMenuType(menuType); + entity.setRoutePath(routePath); + permissionMenuMapper.updateById(entity); + return toItemVo(getMenuById(id)); + } + + @Transactional + public void delete(Long id) { + PermissionMenuEntity entity = getMenuById(id); + userColumnPermissionMapper.delete(new LambdaUpdateWrapper() + .eq(UserColumnPermissionEntity::getColumnId, entity.getId())); + permissionMenuMapper.deleteById(entity.getId()); + } + + public UserColumnIdsVo getUserColumnIds(Long userId, String menuType) { + AdminUserEntity user = getUserById(userId); + List columnIds; + if (isSuperAdmin(user)) { + columnIds = list(menuType).stream().map(PermissionMenuItemVo::getId).toList(); + } else { + List assignedIds = userColumnPermissionMapper.selectList( + new LambdaQueryWrapper() + .eq(UserColumnPermissionEntity::getUserId, userId)) + .stream() + .map(UserColumnPermissionEntity::getColumnId) + .distinct() + .toList(); + if (assignedIds.isEmpty()) { + columnIds = List.of(); + } else if (isValidMenuType(menuType)) { + Set allowedIds = list(menuType).stream() + .map(PermissionMenuItemVo::getId) + .collect(Collectors.toSet()); + columnIds = assignedIds.stream().filter(allowedIds::contains).toList(); + } else { + columnIds = assignedIds; + } + } + UserColumnIdsVo vo = new UserColumnIdsVo(); + vo.setColumnIds(columnIds); + return vo; + } + + public List getUserColumnPermissions(Long userId, String menuType) { + AdminUserEntity user = getUserById(userId); + if (isSuperAdmin(user)) { + return list(menuType); + } + List assignedIds = userColumnPermissionMapper.selectList( + new LambdaQueryWrapper() + .eq(UserColumnPermissionEntity::getUserId, userId)) + .stream() + .map(UserColumnPermissionEntity::getColumnId) + .distinct() + .toList(); + if (assignedIds.isEmpty()) { + return List.of(); + } + List menus = permissionMenuMapper.selectBatchIds(assignedIds); + Map menuMap = menus.stream() + .collect(Collectors.toMap(PermissionMenuEntity::getId, Function.identity())); + String safeMenuType = normalizeMenuType(menuType); + return assignedIds.stream() + .map(menuMap::get) + .filter(menu -> menu != null) + .filter(menu -> safeMenuType == null || safeMenuType.equals(menu.getMenuType())) + .map(this::toItemVo) + .toList(); + } + + @Transactional + public void updateUserColumnPermissions(Long userId, UserColumnPermissionUpdateRequest request) { + getUserById(userId); + List requestedIds = request == null ? List.of() : normalizeColumnIds(request.getColumnIds()); + if (!requestedIds.isEmpty()) { + Long validCount = permissionMenuMapper.selectCount(new LambdaQueryWrapper() + .in(PermissionMenuEntity::getId, requestedIds)); + if (validCount == null || validCount != requestedIds.size()) { + throw new BusinessException("存在无效的菜单权限项"); + } + } + + userColumnPermissionMapper.delete(new LambdaUpdateWrapper() + .eq(UserColumnPermissionEntity::getUserId, userId)); + for (Long columnId : requestedIds) { + UserColumnPermissionEntity entity = new UserColumnPermissionEntity(); + entity.setUserId(userId); + entity.setColumnId(columnId); + userColumnPermissionMapper.insert(entity); + } + } + + private PermissionMenuEntity getMenuById(Long id) { + PermissionMenuEntity entity = permissionMenuMapper.selectById(id); + if (entity == null) { + throw new BusinessException("菜单权限项不存在"); + } + return entity; + } + + private AdminUserEntity getUserById(Long userId) { + AdminUserEntity entity = adminUserMapper.selectById(userId); + if (entity == null) { + throw new BusinessException("用户不存在"); + } + return entity; + } + + private boolean isSuperAdmin(AdminUserEntity user) { + return user != null && "super_admin".equalsIgnoreCase(normalizeRequired(user.getRole(), "")); + } + + private void ensureUniqueColumnKey(String columnKey, Long excludeId) { + PermissionMenuEntity exists = permissionMenuMapper.selectOne(new LambdaQueryWrapper() + .eq(PermissionMenuEntity::getColumnKey, columnKey) + .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()) { + throw new BusinessException(message); + } + return normalized; + } + + private boolean isValidMenuType(String menuType) { + return normalizeMenuType(menuType) != null; + } + + private String normalizeMenuTypeRequired(String menuType) { + String normalized = normalizeMenuType(menuType); + if (normalized == null) { + throw new BusinessException("菜单类型仅支持 app 或 admin"); + } + return normalized; + } + + private String normalizeMenuType(String menuType) { + String normalized = menuType == null ? "" : menuType.trim().toLowerCase(Locale.ROOT); + if (normalized.isEmpty()) { + return null; + } + if (MENU_TYPE_APP.equals(normalized) || MENU_TYPE_ADMIN.equals(normalized)) { + return normalized; + } + return null; + } + + private List normalizeColumnIds(List columnIds) { + if (columnIds == null || columnIds.isEmpty()) { + return List.of(); + } + Set uniqueIds = new LinkedHashSet<>(); + for (Long columnId : columnIds) { + if (columnId != null && columnId > 0) { + uniqueIds.add(columnId); + } + } + return new ArrayList<>(uniqueIds); + } + + private PermissionMenuItemVo toItemVo(PermissionMenuEntity entity) { + PermissionMenuItemVo vo = new PermissionMenuItemVo(); + vo.setId(entity.getId()); + vo.setName(entity.getName()); + vo.setColumnKey(entity.getColumnKey()); + vo.setMenuType(entity.getMenuType()); + vo.setRoutePath(entity.getRoutePath()); + vo.setCreatedAt(entity.getCreatedAt()); + return vo; + } +} 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 17be534..e401ccb 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 @@ -26,6 +26,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -36,8 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; import java.io.InputStream; import java.net.URI; @@ -50,214 +50,131 @@ import java.util.List; @RequestMapping("/api/product-risk-resolve") @Tag( name = "商品风险解决", - description = "亚马逊商品风险处理：备选店铺、紫鸟匹配、创建任务、Python 队列与回传、生成 zip。" - + "查询类接口需带 Query 参数 user_id（与登录用户一致）。") + description = "亚马逊商品风险处理：备选店铺、紫鸟匹配、创建任务、Python 队列与回传、生成 zip。查询类接口需要携带 Query 参数 user_id。") public class ProductRiskResolveController { private final ProductRiskResolveService productRiskResolveService; private final ProductRiskTaskService productRiskTaskService; @GetMapping("/candidates") - @Operation( - summary = "查询备选店铺列表", - description = "返回当前用户在「商品风险」模块中已保存的备选店铺，按创建时间倒序。用于前端勾选后再调用匹配接口。") + @Operation(summary = "查询备选店铺列表", description = "返回当前用户在商品风险模块中已保存的备选店铺。") public ApiResponse> listCandidates( - @Parameter( - name = "user_id", - description = "当前用户 ID，仅返回该用户下的备选店铺", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { return ApiResponse.success(productRiskResolveService.listCandidates(userId)); } @PostMapping("/candidates") - @Operation( - summary = "新增备选店铺", - description = "将店铺名写入用户备选表；店铺名会规范化去重。仅用于前端勾选与匹配流程，与任务/结果表无强绑定。") + @Operation(summary = "新增备选店铺", description = "将店铺名写入用户备选表，用于前端勾选和匹配流程。") public ApiResponse addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request) { return ApiResponse.success(productRiskResolveService.addCandidate(request)); } @DeleteMapping("/candidates/{id}") - @Operation( - summary = "删除备选店铺", - description = "按主键删除一条备选记录；`id` 必须属于当前 `user_id`，否则报错。") + @Operation(summary = "删除备选店铺", description = "删除一条备选记录，id 必须属于当前 user_id。") public ApiResponse deleteCandidate( - @Parameter(description = "备选店铺记录主键（biz_product_risk_shop_candidate.id）", example = "10") - @PathVariable Long id, - @Parameter( - name = "user_id", - description = "当前用户 ID，用于校验数据归属", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(description = "备选店铺记录主键", example = "10") @PathVariable Long id, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { productRiskResolveService.deleteCandidate(userId, id); return ApiResponse.success(null); } @GetMapping("/country-preference") - @Operation( - summary = "查询用户五国处理顺序", - description = "返回当前用户已保存的国家代码列表（顺序即处理顺序）；未保存时返回默认：DE、UK、FR、IT、ES（全选）。") + @Operation(summary = "查询国家处理顺序", description = "返回当前用户保存的国家代码列表，顺序即处理顺序。") public ApiResponse getCountryPreference( - @Parameter( - name = "user_id", - description = "当前用户 ID", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { return ApiResponse.success(productRiskResolveService.getCountryPreference(userId)); } @PutMapping("/country-preference") - @Operation( - summary = "保存用户五国处理顺序", - description = "写入 biz_product_risk_country_pref；country_codes 为 ProductRiskCountryCode 枚举名，至少 1 个、无重复。") + @Operation(summary = "保存国家处理顺序", description = "保存当前用户的国家勾选与处理顺序。") public ApiResponse saveCountryPreference( @Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request) { return ApiResponse.success(productRiskResolveService.saveCountryPreference(request)); } @PostMapping("/match-shops") - @Operation( - summary = "批量匹配店铺（紫鸟索引）", - description = "按店名查紫鸟索引，返回 shopId、platform、companyName、matchStatus 等；items 可作队列 data.items。" - + "未命中时 matched=false，不可创建任务。") + @Operation(summary = "批量匹配店铺", description = "按店名查询紫鸟索引，返回 shopId、platform、companyName、matchStatus 等。") public ApiResponse matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request) { return ApiResponse.success(productRiskResolveService.matchShops(request)); } @GetMapping("/dashboard") - @Operation( - summary = "统计看板", - description = "汇总当前用户：备选店铺数量；商品风险模块下已结束任务数（SUCCESS/FAILED）；其中成功任务数、失败任务数。") + @Operation(summary = "统计看板", description = "返回候选店铺数量、已结束任务数、成功任务数和失败任务数。") public ApiResponse dashboard( - @Parameter( - name = "user_id", - description = "当前用户 ID", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { return ApiResponse.success(productRiskTaskService.dashboard(userId)); } @GetMapping("/history") - @Operation( - summary = "处理记录列表（含进行中与已结束）", - description = "返回当前用户商品风险模块下各店结果行（biz_file_result），按创建时间倒序最多 100 条；" - + "含 resultId、taskId、店名、任务状态、success、错误、输出文件名等。") + @Operation(summary = "处理记录列表", description = "返回当前用户商品风险模块下各店结果行，含运行中与历史记录。") public ApiResponse history( - @Parameter( - name = "user_id", - description = "当前用户 ID", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { return ApiResponse.success(productRiskTaskService.listHistory(userId)); } @DeleteMapping("/history/{resultId}") - @Operation( - summary = "删除单条店铺结果记录", - description = "删除一条 biz_file_result（须为本模块且归属 user_id）；随后重算父任务，无子结果则删任务。") + @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") + @Parameter(description = "结果行主键 biz_file_result.id", example = "1001") @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { productRiskTaskService.deleteHistory(resultId, userId); return ApiResponse.success(null); } @PostMapping("/tasks") - @Operation( - summary = "创建商品风险处理任务", - description = "推 Python 队列前调用：落库 RUNNING 任务及各店 biz_file_result；响应 taskId 写入队列 data.taskId，" - + "items 含各店 resultId。请求 items 须全为 matched=true，店名会去重。") + @Operation(summary = "创建商品风险处理任务", description = "落库 RUNNING 任务及各店占位结果，返回 taskId 与 items。") public ApiResponse createTask(@Valid @RequestBody ProductRiskCreateTaskRequest request) { return ApiResponse.success(productRiskTaskService.createTask(request)); } @DeleteMapping("/tasks/{taskId}") - @Operation( - summary = "删除整条任务", - description = "删除该任务及下属全部结果行（RUNNING/SUCCESS/FAILED 均可）；user_id 须与任务归属一致。") + @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") + @Parameter(description = "任务主键 biz_file_task.id", example = "200") @PathVariable Long taskId, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) { productRiskTaskService.deleteTask(taskId, userId); return ApiResponse.success(null); } @DeleteMapping("/pending-shop-result") - @Operation( - summary = "按店铺名删除运行中任务下的一条结果", - description = "仅在 RUNNING 任务下按规范化店名删一条 biz_file_result 并重算任务；无匹配时 removed=false。" - + "用于前端从匹配列表移除店铺时同步后端占位。") + @Operation(summary = "按店铺名删除运行中结果", description = "仅在 RUNNING 任务下按规范化店名删除一条 biz_file_result，并重算任务。") public ApiResponse deletePendingShopResult( - @Parameter( - name = "user_id", - description = "当前用户 ID", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId, - @Parameter( - name = "shop_name", - description = "店铺名称（与匹配/创建任务时一致；服务端会按紫鸟规则规范化后再与库中 source_filename 比对）", - required = true, - in = ParameterIn.QUERY, - example = "某某店铺") + @Parameter(name = "shop_name", description = "店铺名称", required = true, in = ParameterIn.QUERY, example = "某某店铺") @RequestParam("shop_name") String shopName) { return ApiResponse.success(productRiskTaskService.deletePendingShopResult(userId, shopName)); } @PostMapping("/tasks/batch") - @Operation( - summary = "批量查询任务详情（轮询）", - description = "按 taskIds 返回任务概要及各店结果；无效 id 记入 missingTaskIds。供前端轮询 RUNNING 至结束。") + @Operation(summary = "批量查询任务详情", description = "按 taskIds 返回任务概览与各店结果，供前端轮询使用。") public ApiResponse tasksBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) { return ApiResponse.success(productRiskTaskService.getTaskDetailsBatch(request.getTaskIds())); } @PostMapping("/tasks/{taskId}/result") @Operation( - summary = "Python 回传处理结果（可多次、可分批）", - description = "Python 调用；同一 taskId 可多次，未出现在 shops 中的店保持待处理。" - + "有 error 则标店失败；否则按 countries（键为五国枚举 DE/FR/ES/IT/UK）生成 xlsx/zip 上传 OSS，" - + "Excel 内仍为中文工作表名。全部店终态后任务 SUCCESS/FAILED。") + summary = "Python 回传处理结果", + description = "同一 taskId 可多次回传。成功时按 countries 生成 xlsx/zip 并上传 OSS，全部店铺终态后任务进入 SUCCESS/FAILED。") public ApiResponse submitResult( - @Parameter(description = "任务主键，须为 RUNNING 状态", example = "200") - @PathVariable Long taskId, + @Parameter(description = "任务主键，需处于 RUNNING 状态", example = "200") @PathVariable Long taskId, @io.swagger.v3.oas.annotations.parameters.RequestBody( - description = "按店铺回传：成功时 `countries` 的 key 为枚举 ProductRiskCountryCode（JSON 与枚举名一致：DE、FR、ES、IT、UK）；" - + "失败时填 `error`，可不传 `countries`", + description = "按店铺回传结果；失败时填写 error，成功时填写 countries。", required = true, content = @Content( mediaType = "application/json", schema = @Schema(implementation = ProductRiskSubmitResultRequest.class), examples = { @ExampleObject( - name = "成功（单店，五国含样例行）", - summary = "DE、UK 各一行，其余国可为空数组", + name = "成功示例", + summary = "DE、UK 各一行，其余国家可为空数组", value = """ { "shops": [ @@ -269,7 +186,7 @@ public class ProductRiskResolveController { "shopName": "模拟旗舰店A", "productAsinSku": "B0DEMO1234", "status": "风险待解除", - "done": "否", + "done": true, "removeAsin": "B0OLD5678", "removeStatus": "排队中" } @@ -282,7 +199,7 @@ public class ProductRiskResolveController { "shopName": "模拟旗舰店A", "productAsinSku": "B0UKDEMO99", "status": "正常", - "done": "是", + "done": true, "removeAsin": "", "removeStatus": "" } @@ -293,7 +210,7 @@ public class ProductRiskResolveController { } """), @ExampleObject( - name = "失败（单店仅 error）", + name = "失败示例", summary = "该店标记失败，不生成 zip", value = """ { @@ -312,18 +229,10 @@ public class ProductRiskResolveController { } @GetMapping("/results/{resultId}/download") - @Operation( - summary = "流式下载单个店铺的 zip 结果", - description = "从 OSS 拉取 zip 以附件写入响应体（非 JSON）；须归属 user_id；无文件则 404。") + @Operation(summary = "下载单个店铺的 zip 结果", description = "从 OSS 拉取 zip 并以附件流返回；需校验 user_id 归属。") public void downloadResult( - @Parameter(description = "店铺结果行主键 biz_file_result.id", example = "1001") - @PathVariable Long resultId, - @Parameter( - name = "user_id", - description = "当前用户 ID", - required = true, - in = ParameterIn.QUERY, - example = "1") + @Parameter(description = "结果行主键 biz_file_result.id", example = "1001") @PathVariable Long resultId, + @Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId, jakarta.servlet.http.HttpServletResponse response) { String url = productRiskTaskService.resolveResultDownloadUrl(resultId, userId); 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 fe24cc6..ef4448f 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 @@ -201,11 +201,13 @@ public class ProductRiskTaskService { if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { return; } + String oldStatus = task.getStatus(); List latest = fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getTaskId, taskId) .eq(FileResultEntity::getModuleType, MODULE_TYPE) .orderByAsc(FileResultEntity::getId)); if (latest.isEmpty()) { + log.warn("[product-risk] reconcile delete empty taskId={} oldStatus={} -> deleting task", taskId, oldStatus); fileTaskMapper.deleteById(taskId); return; } @@ -255,6 +257,8 @@ public class ProductRiskTaskService { log.warn("[product-risk] compact result json failed: {}", ex.getMessage()); } fileTaskMapper.updateById(task); + log.warn("[product-risk] reconcile status changed taskId={} oldStatus={} newStatus={} ok={} fail={} allDone={} errorMessage={}", + taskId, oldStatus, task.getStatus(), ok, fail, allDone, task.getErrorMessage()); if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { productRiskTaskCacheService.deleteTaskCache(taskId); @@ -384,8 +388,11 @@ public class ProductRiskTaskService { throw new BusinessException("任务不存在"); } 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("任务已结束，拒绝重复提交"); } + String oldStatus = task.getStatus(); List resultRows = fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getTaskId, taskId) @@ -525,6 +532,9 @@ public class ProductRiskTaskService { log.warn("[product-risk] compact result json failed: {}", ex.getMessage()); } fileTaskMapper.updateById(task); + log.warn("[product-risk] submitResult status evaluated taskId={} oldStatus={} newStatus={} ok={} fail={} allDone={} matchedShopCount={} skippedUnmatchedCount={} waitingCount={} assembledCount={} fallbackMatchedCount={} batchErrors={}", + taskId, oldStatus, task.getStatus(), ok, fail, allDone, matchedShopCount, skippedUnmatchedCount, + waitingCount, assembledCount, fallbackMatchedCount, batchErrors); } @Transactional @@ -537,8 +547,11 @@ public class ProductRiskTaskService { return false; } if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { + log.warn("[product-risk] stale finalize skipped taskId={} status={} fromCompensation={}", + taskId, task.getStatus(), fromCompensation); return true; } + String oldStatus = task.getStatus(); List resultRows = fileResultMapper.selectList(new LambdaQueryWrapper() .eq(FileResultEntity::getTaskId, taskId) @@ -620,6 +633,8 @@ public class ProductRiskTaskService { .eq(FileResultEntity::getModuleType, MODULE_TYPE) .orderByAsc(FileResultEntity::getId)); updateTaskStatusFromLatestRows(task, latest, batchErrors); + log.warn("[product-risk] stale finalize status evaluated taskId={} oldStatus={} newStatus={} changed={} cachedPayloadCount={} fromCompensation={} batchErrors={}", + taskId, oldStatus, task.getStatus(), changed, cachedPayloadByShop.size(), fromCompensation, batchErrors); return true; } @@ -677,6 +692,7 @@ public class ProductRiskTaskService { private void updateTaskStatusFromLatestRows(FileTaskEntity task, List latest, List batchErrors) { + String oldStatus = task.getStatus(); int ok = 0; int fail = 0; List allErrors = new ArrayList<>(); @@ -721,6 +737,8 @@ public class ProductRiskTaskService { log.warn("[product-risk] compact result json failed: {}", ex.getMessage()); } fileTaskMapper.updateById(task); + log.warn("[product-risk] status updated from latest rows taskId={} oldStatus={} newStatus={} ok={} fail={} allDone={} batchErrors={} errorMessage={}", + task.getId(), oldStatus, task.getStatus(), ok, fail, allDone, batchErrors, task.getErrorMessage()); } private ProductRiskTaskDetailVo buildTaskDetail(FileTaskEntity task) { 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 8fcad42..dea5548 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 @@ -61,7 +61,7 @@ public class ShopMatchTaskService { public ProductRiskDashboardVo dashboard(Long userId) { if (userId == null || userId <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } ProductRiskDashboardVo vo = new ProductRiskDashboardVo(); vo.setCandidateCount(candidateMapper.selectCount(new LambdaQueryWrapper() @@ -86,7 +86,7 @@ public class ShopMatchTaskService { public ProductRiskHistoryVo listHistory(Long userId) { if (userId == null || userId <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } ProductRiskHistoryVo vo = new ProductRiskHistoryVo(); List entities = fileResultMapper.selectList(new LambdaQueryWrapper() @@ -118,11 +118,11 @@ public class ShopMatchTaskService { @Transactional public void deleteHistory(Long resultId, Long userId) { if (userId == null || userId <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } FileResultEntity entity = fileResultMapper.selectById(resultId); if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("记录不存在"); } Long taskId = entity.getTaskId(); fileResultMapper.deleteById(resultId); @@ -134,11 +134,11 @@ public class ShopMatchTaskService { @Transactional public void deleteTask(Long taskId, Long userId) { if (userId == null || userId <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务不存在"); } fileResultMapper.delete(new LambdaQueryWrapper() .eq(FileResultEntity::getTaskId, taskId) @@ -186,10 +186,10 @@ public class ShopMatchTaskService { public String resolveResultDownloadUrl(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("记录不存在"); } if (entity.getResultFileUrl() == null || entity.getResultFileUrl().isBlank()) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务不存在"); } return ossStorageService.generateFreshDownloadUrl(entity.getResultFileUrl()); } @@ -197,7 +197,7 @@ public class ShopMatchTaskService { public String resolveResultDownloadFilename(Long resultId, Long userId) { FileResultEntity entity = fileResultMapper.selectById(resultId); if (entity == null || !MODULE_TYPE.equals(entity.getModuleType()) || !userId.equals(entity.getUserId())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务不存在"); } return entity.getResultFilename() != null && !entity.getResultFilename().isBlank() ? entity.getResultFilename() @@ -207,18 +207,18 @@ public class ShopMatchTaskService { @Transactional public ProductRiskCreateTaskVo createTask(ShopMatchCreateTaskRequest request) { if (request.getUserId() == null || request.getUserId() <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } if (request.getItems() == null || request.getItems().isEmpty()) { - throw new BusinessException("items 涓嶈兘涓虹┖"); + throw new BusinessException("items 不能为空"); } List uniqueItems = dedupeQueueItems(request.getItems()); if (uniqueItems.isEmpty()) { - throw new BusinessException("items 涓嶈兘涓虹┖"); + throw new BusinessException("items 不能为空"); } for (ProductRiskShopQueueItemVo item : uniqueItems) { if (item == null || !item.isMatched()) { - throw new BusinessException("瀛樺湪鏈尮閰嶅簵閾猴紝鏃犳硶鍒涘缓浠诲姟"); + throw new BusinessException("存在未匹配店铺，无法创建任务"); } } @@ -254,7 +254,7 @@ public class ShopMatchTaskService { for (ProductRiskShopQueueItemVo item : uniqueItems) { String normalized = ziniaoShopSwitchService.normalizeShopName(item.getShopName()); if (normalized.isBlank()) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务数据已失效，请刷新后重试"); } FileResultEntity result = new FileResultEntity(); result.setTaskId(task.getId()); @@ -271,7 +271,7 @@ public class ShopMatchTaskService { task.setRequestJson(objectMapper.writeValueAsString(persistedRequest)); task.setResultJson(objectMapper.writeValueAsString(snapshot)); } catch (Exception ex) { - throw new BusinessException("Invalid request"); + throw new BusinessException("task 不存在"); } fileTaskMapper.updateById(task); @@ -284,34 +284,34 @@ public class ShopMatchTaskService { @Transactional public void activateTask(Long taskId, Long userId, Integer stageIndex) { if (taskId == null || taskId <= 0) { - throw new BusinessException("taskId is invalid"); + throw new BusinessException("taskId 不合法"); } if (userId == null || userId <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } if (stageIndex == null || stageIndex < 0) { - throw new BusinessException("stage_index is invalid"); + throw new BusinessException("stage_index 不合法"); } FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务不存在"); } if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务状态不正确"); } if (!"SCHEDULED".equals(task.getStatus())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务状态不正确"); } - if (task.getScheduledAt() != null && LocalDateTime.now().isBefore(task.getScheduledAt())) { - throw new BusinessException("鏈埌瀹氭椂鎵ц鏃堕棿"); + if (task.getScheduledAt() != null && LocalDateTime.now().isBefore(task.getScheduledAt().minusSeconds(90))) { + throw new BusinessException("未到定时执行时间"); } ShopMatchCreateTaskRequest state = parseTaskRequest(task); int currentStageIndex = state.getCurrentStageIndex() == null ? 0 : state.getCurrentStageIndex(); if (currentStageIndex != stageIndex) { - throw new BusinessException("褰撳墠杞宸插彉鍖栵紝璇峰埛鏂板悗閲嶈瘯"); + throw new BusinessException("当前轮次已变化，请刷新后重试"); } if (state.getScheduleTimes() == null || stageIndex >= state.getScheduleTimes().size()) { - throw new BusinessException("Invalid request"); + throw new BusinessException("轮次配置缺失"); } state.setActiveStageIndex(stageIndex); task.setStatus("RUNNING"); @@ -323,28 +323,28 @@ public class ShopMatchTaskService { @Transactional public void completeStage(Long taskId, Long userId, ShopMatchStageCompleteRequest request) { if (taskId == null || taskId <= 0) { - throw new BusinessException("taskId is invalid"); + throw new BusinessException("taskId 不合法"); } if (userId == null || userId <= 0) { - throw new BusinessException("user_id is invalid"); + throw new BusinessException("user_id 不合法"); } if (request == null || request.getStageIndex() == null || request.getStageIndex() < 0) { - throw new BusinessException("stage_index is invalid"); + throw new BusinessException("stage_index 不合法"); } FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务不存在"); } if (!"RUNNING".equals(task.getStatus())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务状态不正确"); } ShopMatchCreateTaskRequest state = parseTaskRequest(task); if (state.getActiveStageIndex() == null || !state.getActiveStageIndex().equals(request.getStageIndex())) { - throw new BusinessException("杞鐘舵€佷笉鍖归厤"); + throw new BusinessException("轮次状态不匹配"); } int nextIndex = request.getStageIndex() + 1; if (state.getScheduleTimes() == null || nextIndex >= state.getScheduleTimes().size()) { - throw new BusinessException("Current stage is already the final stage"); + throw new BusinessException("当前轮次已经是最后一轮"); } state.setCurrentStageIndex(nextIndex); state.setActiveStageIndex(null); @@ -360,18 +360,18 @@ public class ShopMatchTaskService { @Transactional public void submitResult(Long taskId, ShopMatchSubmitResultRequest request) { if (taskId == null || taskId <= 0) { - throw new BusinessException("taskId is invalid"); + throw new BusinessException("taskId 不合法"); } if (request == null || request.getShops() == null || request.getShops().isEmpty()) { - throw new BusinessException("shops 涓嶈兘涓虹┖"); + throw new BusinessException("shops 不能为空"); } FileTaskEntity task = fileTaskMapper.selectById(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { - throw new BusinessException("Invalid request"); + throw new BusinessException("任务不存在"); } if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { - throw new BusinessException("浠诲姟宸茬粨鏉燂紝鎷掔粷閲嶅鎻愪氦"); + throw new BusinessException("任务已结束，拒绝重复提交"); } List resultRows = fileResultMapper.selectList(new LambdaQueryWrapper() @@ -408,7 +408,7 @@ public class ShopMatchTaskService { continue; } if (countPayloadRows(merged) <= 0) { - markResultFailed(result, "No result rows received for assembly"); + markResultFailed(result, "未收到可用于组装的结果数据"); shopMatchTaskCacheService.removeShopMergedPayload(taskId, shopKey); continue; } @@ -416,7 +416,7 @@ public class ShopMatchTaskService { assembleShopResult(result, shopKey, merged, workRoot); shopMatchTaskCacheService.removeShopMergedPayload(taskId, shopKey); } catch (Exception ex) { - markResultFailed(result, ex.getMessage() == null ? "assemble failed" : ex.getMessage()); + markResultFailed(result, ex.getMessage() == null ? "结果组装失败" : ex.getMessage()); shopMatchTaskCacheService.removeShopMergedPayload(taskId, shopKey); } } @@ -468,8 +468,8 @@ public class ShopMatchTaskService { ShopMatchShopPayloadDto cachedPayload = shopKey == null ? null : cachedPayloadByShop.get(shopKey); if (cachedPayload == null) { - markResultFailed(result, "Python interrupted before this shop finished uploading results"); - batchErrors.add(shopKey + ": Python interrupted before this shop finished uploading results"); + markResultFailed(result, "Python 在该店铺结果上传完成前中断"); + batchErrors.add(shopKey + ": Python 在该店铺结果上传完成前中断"); changed = true; continue; } @@ -483,7 +483,7 @@ public class ShopMatchTaskService { } if (countPayloadRows(cachedPayload) <= 0 && payloadHasAnyDoneTrue(cachedPayload)) { - markResultFailed(result, "No result rows received for assembly"); + markResultFailed(result, "未收到可用于组装的结果数据"); shopMatchTaskCacheService.removeShopMergedPayload(taskId, shopKey); changed = true; log.warn("[shop-match] stale finalize finished without data taskId={} shop={} fromCompensation={}", @@ -492,8 +492,8 @@ public class ShopMatchTaskService { } if (countPayloadRows(cachedPayload) <= 0) { - markResultFailed(result, "Python interrupted before any assembleable rows were uploaded"); - batchErrors.add(shopKey + ": Python interrupted before any assembleable rows were uploaded"); + markResultFailed(result, "Python 在上传可组装结果前中断"); + batchErrors.add(shopKey + ": Python 在上传可组装结果前中断"); shopMatchTaskCacheService.removeShopMergedPayload(taskId, shopKey); changed = true; continue; @@ -506,7 +506,7 @@ public class ShopMatchTaskService { log.warn("[shop-match] stale finalize assembled taskId={} shop={} fromCompensation={} completedFlag={}", taskId, shopKey, fromCompensation, isShopPayloadCompleted(cachedPayload)); } catch (Exception ex) { - String message = ex.getMessage() == null ? "assemble failed" : ex.getMessage(); + String message = ex.getMessage() == null ? "结果组装失败" : ex.getMessage(); markResultFailed(result, message); batchErrors.add(shopKey + ": " + message); shopMatchTaskCacheService.removeShopMergedPayload(taskId, shopKey); @@ -595,11 +595,11 @@ public class ShopMatchTaskService { task.setFinishedAt(LocalDateTime.now()); } else if (ok > 0) { task.setStatus("SUCCESS"); - task.setErrorMessage(String.join("; ", errors.isEmpty() ? batchErrors : errors)); + task.setErrorMessage(String.join("；", errors.isEmpty() ? batchErrors : errors)); task.setFinishedAt(LocalDateTime.now()); } else { task.setStatus("FAILED"); - task.setErrorMessage(errors.isEmpty() ? "all shops failed" : String.join("; ", errors)); + task.setErrorMessage(errors.isEmpty() ? "全部店铺处理失败" : String.join("；", errors)); task.setFinishedAt(LocalDateTime.now()); } try { @@ -633,7 +633,7 @@ public class ShopMatchTaskService { .orderByAsc(FileResultEntity::getId)); List items = new ArrayList<>(); for (FileResultEntity row : rows) { - throw new BusinessException("Task request payload is missing"); + items.add(toHistoryItemVo(row, taskStatus)); } return items; } @@ -778,7 +778,7 @@ public class ShopMatchTaskService { private ShopMatchCreateTaskRequest parseTaskRequest(FileTaskEntity task) { ShopMatchCreateTaskRequest request = parseTaskRequestSilently(task); if (request == null) { - throw new BusinessException("浠诲姟閰嶇疆缂哄け"); + throw new BusinessException("任务配置缺失"); } if (request.getItems() == null) { request.setItems(new ArrayList<>()); @@ -807,7 +807,7 @@ public class ShopMatchTaskService { try { task.setRequestJson(objectMapper.writeValueAsString(request)); } catch (Exception ex) { - throw new BusinessException("Invalid request"); + throw new BusinessException("序列化任务数据失败"); } } @@ -831,7 +831,7 @@ public class ShopMatchTaskService { private List normalizeCountryCodes(List raw) { if (raw == null || raw.isEmpty()) { - throw new BusinessException("country_codes 涓嶈兘涓虹┖"); + throw new BusinessException("country_codes 不能为空"); } LinkedHashSet out = new LinkedHashSet<>(); for (String code : raw) { @@ -842,12 +842,12 @@ public class ShopMatchTaskService { try { ProductRiskCountryCode.valueOf(normalized); } catch (IllegalArgumentException ex) { - throw new BusinessException("闈炴硶鍥藉浠ｇ爜: " + code); + throw new BusinessException("非法国家代码: " + code); } out.add(normalized); } if (out.isEmpty()) { - throw new BusinessException("country_codes 涓嶈兘涓虹┖"); + throw new BusinessException("country_codes 不能为空"); } return new ArrayList<>(out); } @@ -864,16 +864,16 @@ public class ShopMatchTaskService { continue; } if (!time.isAfter(now)) { - throw new BusinessException("schedule_times 蹇呴』鏅氫簬褰撳墠鏃堕棿"); + throw new BusinessException("schedule_times 必须晚于当前时间"); } if (previous != null && !time.isAfter(previous)) { - throw new BusinessException("schedule_times 蹇呴』鎸夋椂闂撮€掑"); + throw new BusinessException("schedule_times 必须按时间递增"); } out.add(time); previous = time; } if (out.isEmpty()) { - throw new BusinessException("schedule_times 涓嶈兘涓虹┖"); + throw new BusinessException("schedule_times 不能为空"); } return out; } diff --git a/backend-java/src/main/resources/db/V20__columns_add_menu_type_and_route_path.sql b/backend-java/src/main/resources/db/V20__columns_add_menu_type_and_route_path.sql new file mode 100644 index 0000000..0fadbea --- /dev/null +++ b/backend-java/src/main/resources/db/V20__columns_add_menu_type_and_route_path.sql @@ -0,0 +1,9 @@ +ALTER TABLE `columns` + ADD COLUMN `menu_type` VARCHAR(20) NOT NULL DEFAULT 'app' COMMENT '菜单类型: app/admin' AFTER `column_key`, + ADD COLUMN `route_path` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '菜单路由或页面标识' AFTER `menu_type`; + +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' +); diff --git a/backend/__pycache__/config.cpython-312.pyc b/backend/__pycache__/config.cpython-312.pyc index 7003e12b6bf9047916f6dbe5d7c9de415ec98161..02e3b90d1887b98ce1d899b3a9482e987b8c35d7 100644 GIT binary patch delta 87 zcmaFH{gRveG%qg~0}yE3y19}2JClfHMoCG5mA<}(o}saso}s0lp}Fy9Vdg+4l?M`1 r^SNen&F7oRcR}6mf1{7u4-8I7D2Qh`cV5a8V-RLSo8giPQ@Wq7No_v&I1cK8_p{ diff --git a/backend/blueprints/__pycache__/admin_api.cpython-312.pyc b/backend/blueprints/__pycache__/admin_api.cpython-312.pyc index 7f09ff3d0a1dfcbd8b49268294f64769d6e17a21..df04bc038782306ad9394bffbd3bed7131cb18f4 100644 GIT binary patch delta 10839 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 delta 11530 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 diff --git a/backend/blueprints/admin_api.py b/backend/blueprints/admin_api.py index 5b00eb5..00694bb 100644 --- a/backend/blueprints/admin_api.py +++ b/backend/blueprints/admin_api.py @@ -70,6 +70,26 @@ def _proxy_backend_java(method, path, *, params=None, json_data=None, files=None return data, None, 200 +def _format_permission_item(item): + return { + 'id': item.get('id'), + 'name': item.get('name') or '', + 'column_key': item.get('columnKey') or '', + 'menu_type': item.get('menuType') or 'app', + 'route_path': item.get('routePath') or '', + 'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16], + } + + +def _sync_user_column_permissions(user_id, column_ids): + _, error_response, status = _proxy_backend_java( + 'PUT', + f'/api/admin/permission-users/{user_id}/columns', + json_data={'columnIds': [int(x) for x in (column_ids or []) if str(x).isdigit()]}, + ) + return error_response, status + + # ---------- 用户管理 ---------- @admin_api.route('/users') @@ -155,6 +175,7 @@ def list_users(): 'total': total, 'page': page, 'page_size': page_size, + 'current_user_id': session.get('user_id'), 'current_user_role': role, 'current_user_username': current_row.get('username') or '', 'admins': admins, @@ -203,9 +224,7 @@ def create_user(): want_created_by = current_row['id'] is_admin = 1 if want_role in ('super_admin', 'admin') else 0 pwd_hash = generate_password_hash(password, method='pbkdf2:sha256') - column_ids = data.get('column_ids') - if column_ids is None: - column_ids = [] + column_ids = data.get('column_ids') or [] try: conn = get_db() with conn.cursor() as cur: @@ -214,9 +233,11 @@ def create_user(): (username, pwd_hash, is_admin, want_role, want_created_by), ) new_uid = cur.lastrowid - _set_user_column_permissions(cur, new_uid, column_ids) conn.commit() conn.close() + error_response, status = _sync_user_column_permissions(new_uid, column_ids) + if error_response is not None: + return error_response, status return jsonify({'success': True, 'msg': '用户创建成功'}) except pymysql.IntegrityError: return jsonify({'success': False, 'error': '用户名已存在'}) @@ -270,10 +291,12 @@ def update_user(uid): (is_admin, want_role, uid), ) column_ids = data.get('column_ids') - if column_ids is not None: - _set_user_column_permissions(cur, uid, column_ids) conn.commit() conn.close() + if column_ids is not None: + error_response, status = _sync_user_column_permissions(uid, column_ids) + if error_response is not None: + return error_response, status return jsonify({'success': True, 'msg': '更新成功'}) except Exception as e: return jsonify({'success': False, 'error': str(e)}) @@ -388,156 +411,124 @@ def history(): @admin_api.route('/columns') @admin_required def list_columns(): - """获取栏目列表（用于栏目配置与用户权限选择）""" - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute( - "SELECT id, name, column_key, created_at FROM columns ORDER BY id" - ) - rows = cur.fetchall() - conn.close() - items = [ - { - 'id': r['id'], - 'name': r['name'] or '', - 'column_key': r['column_key'] or '', - 'created_at': r['created_at'].strftime('%Y-%m-%d %H:%M') if r.get('created_at') else '', - } - for r in rows - ] - return jsonify({'success': True, 'items': items}) - except Exception as e: - return jsonify({'success': False, 'error': str(e)}) + params = {} + menu_type = (request.args.get('menu_type') or '').strip() + if menu_type: + params['menuType'] = menu_type + result, error_response, status = _proxy_backend_java( + 'GET', + '/api/admin/permission-menus', + params=params or None, + ) + 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 [])]}) @admin_api.route('/column', methods=['POST']) @admin_required def create_column(): - """新增栏目""" 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' + route_path = (data.get('route_path') or '').strip() if not name: return jsonify({'success': False, 'error': '栏目名不能为空'}) if not column_key: return jsonify({'success': False, 'error': '栏目标识不能为空'}) - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute( - "INSERT INTO columns (name, column_key) VALUES (%s, %s)", - (name, column_key), - ) - cid = cur.lastrowid - conn.commit() - conn.close() - return jsonify({'success': True, 'msg': '创建成功', 'id': cid}) - except pymysql.IntegrityError: - return jsonify({'success': False, 'error': '栏目标识已存在'}) - except Exception as e: - return jsonify({'success': False, 'error': str(e)}) + if not route_path: + return jsonify({'success': False, 'error': '菜单路由不能为空'}) + result, error_response, status = _proxy_backend_java( + 'POST', + '/api/admin/permission-menus', + json_data={ + 'name': name, + 'columnKey': column_key, + 'menuType': menu_type, + 'routePath': route_path, + }, + ) + if error_response is not None: + return error_response, status + item = result.get('data') or {} + 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): - """更新栏目""" 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' + route_path = (data.get('route_path') or '').strip() if not name: return jsonify({'success': False, 'error': '栏目名不能为空'}) if not column_key: return jsonify({'success': False, 'error': '栏目标识不能为空'}) - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute( - "UPDATE columns SET name = %s, column_key = %s WHERE id = %s", - (name, column_key, cid), - ) - if cur.rowcount == 0: - conn.close() - return jsonify({'success': False, 'error': '栏目不存在'}) - conn.commit() - conn.close() - return jsonify({'success': True, 'msg': '更新成功'}) - except pymysql.IntegrityError: - return jsonify({'success': False, 'error': '栏目标识已存在'}) - except Exception as e: - return jsonify({'success': False, 'error': str(e)}) + if not route_path: + return jsonify({'success': False, 'error': '菜单路由不能为空'}) + result, error_response, status = _proxy_backend_java( + 'PUT', + f'/api/admin/permission-menus/{cid}', + json_data={ + 'name': name, + 'columnKey': column_key, + 'menuType': menu_type, + 'routePath': route_path, + }, + ) + if error_response is not None: + return error_response, status + return jsonify({'success': True, 'msg': result.get('message') or '更新成功'}) @admin_api.route('/column/', methods=['DELETE']) @admin_required def delete_column(cid): - """删除栏目（会同步删除用户栏目权限关联）""" - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute("DELETE FROM user_column_permission WHERE column_id = %s", (cid,)) - cur.execute("DELETE FROM columns WHERE id = %s", (cid,)) - if cur.rowcount == 0: - conn.close() - return jsonify({'success': False, 'error': '栏目不存在'}) - conn.commit() - conn.close() - return jsonify({'success': True, 'msg': '删除成功'}) - except Exception as e: - return jsonify({'success': False, 'error': str(e)}) + result, error_response, status = _proxy_backend_java( + 'DELETE', + f'/api/admin/permission-menus/{cid}', + ) + if error_response is not None: + return error_response, status + return jsonify({'success': True, 'msg': result.get('message') or '删除成功'}) @admin_api.route('/user//columns') @admin_required def get_user_columns(uid): - """获取某用户的栏目权限 ID 列表（编辑用户时回显）""" - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute( - "SELECT column_id FROM user_column_permission WHERE user_id = %s", - (uid,), - ) - rows = cur.fetchall() - conn.close() - column_ids = [r['column_id'] for r in rows] - return jsonify({'success': True, 'column_ids': column_ids}) - except Exception as e: - return jsonify({'success': False, 'error': str(e)}) + params = {} + 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, + ) + if error_response is not None: + return error_response, status + payload = result.get('data') or {} + return jsonify({'success': True, 'column_ids': payload.get('columnIds') or []}) @admin_api.route('/user//column-permissions') @admin_required def get_user_column_permissions(uid): - """根据用户获取其拥有的栏目权限详细信息""" - try: - conn = get_db() - with conn.cursor() as cur: - cur.execute( - """ - SELECT c.id, c.name, c.column_key, c.created_at - FROM user_column_permission ucp - JOIN columns c ON c.id = ucp.column_id - WHERE ucp.user_id = %s - ORDER BY c.id - """, - (uid,), - ) - rows = cur.fetchall() - conn.close() - items = [ - { - 'id': r['id'], - 'name': r['name'] or '', - 'column_key': r['column_key'] or '', - 'created_at': r['created_at'].strftime('%Y-%m-%d %H:%M') if r.get('created_at') else '', - } - for r in rows - ] - return jsonify({'success': True, 'items': items}) - except Exception as e: - return jsonify({'success': False, 'error': str(e)}) + params = {} + 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, + ) + 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 [])]}) def _set_user_column_permissions(cur, user_id, column_ids): diff --git a/backend/config.py b/backend/config.py index 97a3eb7..6692838 100644 --- a/backend/config.py +++ b/backend/config.py @@ -23,8 +23,8 @@ bucket_path = "nanri-image/" file_url_pre = f"https://{bucket}.oss-cn-hangzhou.aliyuncs.com/" import os -backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://127.0.0.1:18080').rstrip('/') -# backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://8.136.19.173:18080').rstrip('/') +# backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://127.0.0.1:18080').rstrip('/') +backend_java_base_url = os.environ.get('BACKEND_JAVA_BASE_URL', 'http://8.136.19.173:18080').rstrip('/') os.environ['OSS_ACCESS_KEY_ID'] = accessKeyId os.environ['OSS_ACCESS_KEY_SECRET'] = accessKeySecret os.environ['SECRET_KEY'] = "ddffc7c1d02121d9554d7b080b2511b6" diff --git a/backend/utils/__pycache__/db.cpython-312.pyc b/backend/utils/__pycache__/db.cpython-312.pyc index fef6ce0d54d5ef9dcd840480c87e2249f55693d9..74e09849dc3c7efc744df9d3918552722660420a 100644 GIT binary patch delta 1063 zcmaiyUq}=|9LHy7Z`HlKm0R6QHUJJD>UeX1>4Q3^Taz zRY~GIp0@(>^(@Y`#7U!xiwP*3#dWA;OyhU0i5(*c0aqHCzpDG|EP^jTBj2K?Q&1*VwlOufdOfrE&y0}wPy=8w19gOZd9LXMR< z0B+D}fuIIFfZeC?fPE9Jr&>q#B-KKyd#HNwFM9?Y#_7D2Fm{=#0heGVuC%*w9nZmy zW6ivn&=tNx%oT4y^~(XJ)T_#;+s}tv+b+sVS($vW(pz2OlUtkG!okp$jwbn-;ygjau2g#ia#lk}M;6&rQK9}tdyJ8R_b&G&ox~M-~4|Mo$cXJQ?R2U)V$Wj?%n_D;;$Cw$49Z?9lrUce*ph^v_W#t2_=R2;cesx`3uUffebS)A3- zkG~}6jtx0aFt87Ek_*=29ny3u!#h7Zk{{c8Z7~2cYS97!LLG|5{TUC^c>N#o>GbpO z9j&oAye##)+Yv}ii-i#2_#WF`TQ~nX!QNxNYwfmwvPd5+X^RUg!ml?Tf!m1|c4Y%G z;|GAebH*XY7&0#XykI)qsa=j;rY2c;ZMh+s48oAKqJhOmN!0P+sjly_x T8lyPruz=^&BJd0zO26?NDDW-w delta 546 zcmX|+&ubGw6vyA2>AIQS?wVhlZQLfQv{p^DQWTU{mfC~6cxdrdBGnZP1qBgOAs%9T z@KPaS?cAj|m4F~Yyh)L|1lXSiWiu&VqilC#(9jZ{ vhye*h$%fPuOA8BnlGVi$NiiGN=;`ziJ&GC+?nF_uDn7*b%RRioyOp)Sd+32O diff --git a/backend/utils/db.py b/backend/utils/db.py index bb156fd..0e72f51 100644 --- a/backend/utils/db.py +++ b/backend/utils/db.py @@ -114,6 +114,18 @@ def init_db(): UNIQUE KEY uk_column_key (column_key) ) """) + try: + cur.execute("ALTER TABLE columns ADD COLUMN menu_type VARCHAR(20) NOT NULL DEFAULT 'app' COMMENT '菜单类型: app/admin' AFTER column_key") + except Exception: + pass + try: + cur.execute("ALTER TABLE columns ADD COLUMN route_path VARCHAR(255) NOT NULL DEFAULT '' COMMENT '菜单路由或页面标识' AFTER menu_type") + except Exception: + pass + try: + cur.execute("UPDATE columns SET menu_type = 'app' WHERE menu_type IS NULL OR menu_type = ''") + except Exception: + pass cur.execute(""" CREATE TABLE IF NOT EXISTS user_column_permission ( user_id INT NOT NULL, diff --git a/backend/web_source/admin.html b/backend/web_source/admin.html index 6c27684..cfca98b 100644 --- a/backend/web_source/admin.html +++ b/backend/web_source/admin.html @@ -637,8 +637,11 @@ // ========== 用户管理 ========== var userPage = 1, userPageSize = 15; + var currentUserId = null; var currentUserRole = 'admin'; var currentUserUsername = ''; + var currentUserAdminPermissionKeys = {}; + var currentUserAdminPermissionRoutes = {}; var adminsList = []; function roleLabel(role) { if (role === 'super_admin') return '超级管理员'; @@ -663,6 +666,7 @@ 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 || []; @@ -683,6 +687,7 @@ updateCreateFormByRole(); updateUserFilterByRole(); updateDedupeTotalDataAccess(); + loadCurrentUserAdminPermissions(); }) .catch(function() { document.getElementById('userListBody').innerHTML = '请求失败'; @@ -722,6 +727,50 @@ 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(); + }); + } var allColumnsList = []; function loadColumnsForPermission() { fetch('/api/admin/columns') diff --git a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue index 4c37ee5..9e3f585 100644 --- a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue @@ -345,6 +345,29 @@ function removeSessionTaskFromStorage(taskId: number) { } } +function isTerminalStatus(status?: string | null) { + return status === 'SUCCESS' || status === 'FAILED' || status === 'COMPLETED' +} + +function pruneTerminalSessionTasksByHistory(items: DeleteBrandResultItem[]) { + if (!items?.length) return false + const terminalTaskIds = new Set() + items.forEach((item) => { + if (item.taskId && isTerminalStatus(item.taskStatus)) { + terminalTaskIds.add(item.taskId) + } + }) + if (!terminalTaskIds.size) return false + + const oldLen = sessionTasks.value.length + sessionTasks.value = sessionTasks.value.filter((task) => !terminalTaskIds.has(task.taskId)) + if (sessionTasks.value.length !== oldLen) { + persistSessionTasks() + return true + } + return false +} + const historySectionItems = computed(() => historyItems.value.filter( @@ -681,7 +704,7 @@ function formatProgressPercent(item: DeleteBrandResultItem) { function isTaskTerminal(taskId: number) { const status = taskDetails.value[taskId]?.task?.status - return status === 'SUCCESS' || status === 'FAILED' + return isTerminalStatus(status) } function getPollingTaskIds() { @@ -1061,6 +1084,7 @@ async function loadHistory() { try { const response = await getDeleteBrandHistory() historyItems.value = normalizeDeleteBrandItems(response.items || []) + pruneTerminalSessionTasksByHistory(historyItems.value) syncResultState() // 关键：页面加载历史后，立刻拉取详情触发状态机 diff --git a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue index 2d52ca5..8284ef5 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue @@ -129,8 +129,11 @@ const pollTimer = ref(null) const pollingInFlight = ref(false) const dispatchTimers = new Map() const scheduledDispatchInFlight = ref(false) -const currentSectionItems = computed(() => uniqueTaskRows(historyItems.value.filter((item) => { const taskId = normalizeTaskId(item.taskId); return !!taskId && !isTaskTerminalById(taskId) }), taskSnapshots.value, 'current')) -const historySectionItems = computed(() => uniqueTaskRows(historyItems.value.filter((item) => { const taskId = normalizeTaskId(item.taskId); return !taskId || isTaskTerminalById(taskId) }), taskSnapshots.value, 'history')) +let scheduleHeartbeatTimer: number | null = null +let lastScheduledErrorAt = 0 +let lastScheduledErrorKey = '' +const currentSectionItems = computed(() => uniqueTaskRows(historyItems.value.filter((item) => { const taskId = normalizeTaskId(item.taskId); return !!taskId && !isTaskTerminalItem(item) }), taskSnapshots.value, 'current')) +const historySectionItems = computed(() => uniqueTaskRows(historyItems.value.filter((item) => { const taskId = normalizeTaskId(item.taskId); return !taskId || isTaskTerminalItem(item) }), taskSnapshots.value, 'history')) const hasVisibleList = computed(() => currentSectionItems.value.length > 0 || historySectionItems.value.length > 0) const countryCheckboxRows = computed(() => { const selectedSet = new Set(orderedCountryCodes.value); return [...orderedCountryCodes.value.map((code) => ({ code, label: countryLabel(code) })), ...COUNTRY_OPTIONS.filter((item) => !selectedSet.has(item.code)).map((item) => ({ code: item.code, label: item.label }))] }) @@ -173,7 +176,14 @@ function addPollingTask(taskId: number) { if (!pollingTaskIds.value.includes(tas function clearDispatchTimer(taskId: number) { const timer = dispatchTimers.get(taskId); if (timer) { window.clearTimeout(timer); dispatchTimers.delete(taskId) } } function removePollingTask(taskId: number) { clearDispatchTimer(taskId); pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId); delete taskDetails.value[taskId]; savePollingIds(); saveTaskDetailsToStorage() } function stopPollingTask(taskId: number, keepStatus = true) { pollingTaskIds.value = pollingTaskIds.value.filter((id) => id !== taskId); if (!keepStatus) delete taskDetails.value[taskId]; savePollingIds(); saveTaskDetailsToStorage() } -function isTaskTerminalById(taskId?: number) { if (!taskId) return false; const status = taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status; return status === 'SUCCESS' || status === 'FAILED' } +function isTaskTerminalStatus(status?: string) { return status === 'SUCCESS' || status === 'FAILED' || status === 'COMPLETED' } +function isTaskTerminalById(taskId?: number) { if (!taskId) return false; const status = taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status; return isTaskTerminalStatus(status) } +function isTaskTerminalItem(item: ShopMatchHistoryItem) { + const taskId = normalizeTaskId(item.taskId) + if (taskId && isTaskTerminalById(taskId)) return true + if (isTaskTerminalStatus(item.taskStatus)) return true + return !!item.success +} async function loadCandidates() { candidates.value = await listShopMatchCandidates() } async function loadDashboard() { dashboard.value = await getShopMatchDashboard() } async function loadHistory() { const data = await getShopMatchHistory(); historyItems.value = data.items || [] } @@ -201,33 +211,56 @@ function removeMatchedRowsLocally(rows: ShopMatchHistoryItem[] | ShopMatchShopQu function parseScheduleValues() { if (!scheduleEnabled.value) return undefined; const values = schedulePickerValues.value.map((item) => item.trim()).filter(Boolean); if (!values.length) throw new Error('请至少选择一个执行时间'); const withTime = values.map((value) => { const normalized = normalizeScheduleValue(value); const date = resolveScheduleDateTime(normalized); if (!date) throw new Error(`时间格式无效: ${value}`); return { raw: formatScheduleDateTime(date), time: date.getTime() } }).sort((a, b) => a.time - b.time); for (let i = 1; i < withTime.length; i += 1) if (withTime[i].time === withTime[i - 1].time) throw new Error('执行时间不能重复'); return withTime.map((item) => item.raw) } function buildQueuePayload(taskId: number, item: Pick, countryCodes: string[], stageIndex?: number, finalStage = true) { return { type: 'shop-match-run', ts: Date.now(), data: { taskId, user_id: currentUserId(), items: [{ shopName: item.shopName, shopId: item.shopId, platform: item.platform, companyName: item.companyName, matched: true, matchStatus: item.matchStatus, matchMessage: item.matchMessage }], country_codes: [...countryCodes], stage_index: stageIndex, final_stage: finalStage } } } function nextScheduleStage(taskId: number) { const task = taskSnapshots.value[taskId]?.task; const stages = task?.scheduleStages || []; const currentStageIndex = task?.currentStageIndex; if (typeof currentStageIndex !== 'number') return null; const stage = stages.find((item) => item.stageIndex === currentStageIndex); if (!stage?.scheduledAt) return null; return { stageIndex: currentStageIndex, scheduledAt: stage.scheduledAt, finalStage: currentStageIndex === stages.length - 1 } } -async function dispatchScheduledTask(taskId: number, item: ShopMatchHistoryItem) { const api = getPywebviewApi(); if (!api?.enqueue_json) throw new Error('当前客户端未提供 enqueue_json'); const stage = nextScheduleStage(taskId); const snapshot = taskSnapshots.value[taskId]; const countryCodes = snapshot?.task?.countryCodes || orderedCountryCodes.value; if (!stage) throw new Error(`任务 ${taskId} 缺少待执行阶段`); clearDispatchTimer(taskId); await activateShopMatchTask(taskId, stage.stageIndex); taskDetails.value = { ...taskDetails.value, [taskId]: 'RUNNING' }; saveTaskDetailsToStorage(); const payload = buildQueuePayload(taskId, item, countryCodes, stage.stageIndex, stage.finalStage); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) throw new Error(result?.error || `任务 ${taskId} 推送失败`); addPollingTask(taskId); queuePushResult.value = `任务 ${taskId} 已推送第 ${stage.stageIndex + 1} 轮`; ensurePolling(true) } +async function dispatchScheduledTask(taskId: number, item: ShopMatchHistoryItem) { const api = getPywebviewApi(); if (!api?.enqueue_json) throw new Error('当前客户端未提供 enqueue_json'); const stage = nextScheduleStage(taskId); const snapshot = taskSnapshots.value[taskId]; const countryCodes = snapshot?.task?.countryCodes || orderedCountryCodes.value; if (!stage) throw new Error(`任务 ${taskId} 缺少待执行阶段`); clearDispatchTimer(taskId); await activateShopMatchTask(taskId, stage.stageIndex); taskDetails.value = { ...taskDetails.value, [taskId]: 'RUNNING' }; if (snapshot?.task) taskSnapshots.value = { ...taskSnapshots.value, [taskId]: { ...snapshot, task: { ...snapshot.task, status: 'RUNNING', activeStageIndex: stage.stageIndex } } }; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); const payload = buildQueuePayload(taskId, item, countryCodes, stage.stageIndex, stage.finalStage); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) throw new Error(result?.error || `任务 ${taskId} 推送失败`); addPollingTask(taskId); queuePushResult.value = `任务 ${taskId} 已推送第 ${stage.stageIndex + 1} 轮`; ensurePolling(true) } function hasRunningTask() { return Object.values(taskDetails.value).some((status) => status === 'RUNNING') || Object.values(taskSnapshots.value).some((detail) => detail.task?.status === 'RUNNING') } -function findNextReadyScheduledTask() { const taskIds = new Set(pollingTaskIds.value); for (const key of Object.keys(taskSnapshots.value)) { const id = normalizeTaskId(key); if (id > 0) taskIds.add(id) } for (const item of historyItems.value) { const id = normalizeTaskId(item.taskId); if (id > 0) taskIds.add(id) } const ready = Array.from(taskIds).map((taskId) => { const snapshot = taskSnapshots.value[taskId]; const taskStatus = snapshot?.task?.status || taskDetails.value[taskId]; const item = snapshot?.items?.[0] || historyItems.value.find((row) => normalizeTaskId(row.taskId) === taskId); const stage = nextScheduleStage(taskId); if (taskStatus !== 'SCHEDULED' || !item || !stage?.scheduledAt) return null; const scheduledTime = new Date(stage.scheduledAt).getTime(); if (!Number.isFinite(scheduledTime) || scheduledTime > Date.now()) return null; return { taskId, item, scheduledTime } }).filter((item): item is { taskId: number; item: ShopMatchHistoryItem; scheduledTime: number } => !!item); ready.sort((a, b) => a.scheduledTime - b.scheduledTime || a.taskId - b.taskId); return ready[0] || null } -async function pumpScheduledQueue() { if (scheduledDispatchInFlight.value || hasRunningTask()) return; const readyTask = findNextReadyScheduledTask(); if (!readyTask) return; scheduledDispatchInFlight.value = true; try { await dispatchScheduledTask(readyTask.taskId, readyTask.item) } catch (error) { const message = error instanceof Error ? error.message : `任务 ${readyTask.taskId} 调度失败`; queuePushResult.value = message; ElMessage.error(message) } finally { scheduledDispatchInFlight.value = false } } +function findNextReadyScheduledTask() { const taskIds = new Set(pollingTaskIds.value); for (const key of Object.keys(taskSnapshots.value)) { const id = normalizeTaskId(key); if (id > 0) taskIds.add(id) } for (const item of historyItems.value) { const id = normalizeTaskId(item.taskId); if (id > 0) taskIds.add(id) } const ready = Array.from(taskIds).map((taskId) => { const snapshot = taskSnapshots.value[taskId]; const taskStatus = taskDetails.value[taskId] || snapshot?.task?.status; const item = snapshot?.items?.[0] || historyItems.value.find((row) => normalizeTaskId(row.taskId) === taskId); const stage = nextScheduleStage(taskId); if (taskStatus !== 'SCHEDULED' || !item || !stage?.scheduledAt) return null; const scheduledTime = new Date(stage.scheduledAt).getTime(); if (!Number.isFinite(scheduledTime) || scheduledTime > Date.now()) return null; return { taskId, item, scheduledTime } }).filter((item): item is { taskId: number; item: ShopMatchHistoryItem; scheduledTime: number } => !!item); ready.sort((a, b) => a.scheduledTime - b.scheduledTime || a.taskId - b.taskId); return ready[0] || null } +async function pumpScheduledQueue() { if (scheduledDispatchInFlight.value || hasRunningTask()) return; const readyTask = findNextReadyScheduledTask(); if (!readyTask) return; scheduledDispatchInFlight.value = true; try { await dispatchScheduledTask(readyTask.taskId, readyTask.item) } catch (error) { const message = error instanceof Error ? error.message : `任务 ${readyTask.taskId} 调度失败`; const key = `${readyTask.taskId}:${message}`; const now = Date.now(); queuePushResult.value = message; if (lastScheduledErrorKey !== key || now - lastScheduledErrorAt > 10000) { lastScheduledErrorKey = key; lastScheduledErrorAt = now; ElMessage.error(message) } await Promise.allSettled([loadHistory(), refreshTaskBatch()]) } finally { scheduledDispatchInFlight.value = false } } function scheduleDispatch(taskId: number, scheduledAt?: string) { if (!scheduledAt) return; clearDispatchTimer(taskId); const time = new Date(scheduledAt).getTime(); if (!Number.isFinite(time)) return; const delay = Math.max(0, time - Date.now()); const timer = window.setTimeout(() => { dispatchTimers.delete(taskId); void pumpScheduledQueue() }, delay); dispatchTimers.set(taskId, timer) } function restoreScheduledDispatches() { const taskIds = new Set(pollingTaskIds.value); for (const key of Object.keys(taskSnapshots.value)) { const id = normalizeTaskId(key); if (id > 0) taskIds.add(id) } for (const item of historyItems.value) { const id = normalizeTaskId(item.taskId); if (id > 0) taskIds.add(id) } for (const taskId of taskIds) { const snapshot = taskSnapshots.value[taskId]; const taskStatus = snapshot?.task?.status || taskDetails.value[taskId]; const stage = nextScheduleStage(taskId); if (taskStatus === 'SCHEDULED' && stage?.scheduledAt) scheduleDispatch(taskId, stage.scheduledAt); else clearDispatchTimer(taskId) } void pumpScheduledQueue() } -async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { const batch = await getShopMatchTasksBatch(pollingTaskIds.value); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removePollingTask(missingId); delete nextSnapshots[missingId] } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; nextSnapshots[taskId] = detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (status === 'SUCCESS' || status === 'FAILED') { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } +function startScheduleHeartbeat() { if (scheduleHeartbeatTimer) return; scheduleHeartbeatTimer = window.setInterval(() => { void pumpScheduledQueue() }, 1000) } +function stopScheduleHeartbeat() { if (!scheduleHeartbeatTimer) return; window.clearInterval(scheduleHeartbeatTimer); scheduleHeartbeatTimer = null } +function handleScheduleRecovery() { restoreScheduledDispatches(); if (pollingTaskIds.value.length) ensurePolling(true) } +async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { const batch = await getShopMatchTasksBatch(pollingTaskIds.value); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removePollingTask(missingId); delete nextSnapshots[missingId] } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; nextSnapshots[taskId] = detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (isTaskTerminalStatus(status)) { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } function getPollIntervalMs() { return document.visibilityState === 'visible' ? 4000 : 10000 } function scheduleNextPoll(immediate = false) { if (pollTimer.value) { if (!immediate) return; window.clearTimeout(pollTimer.value); pollTimer.value = null } const run = async () => { pollTimer.value = null; if (pollingInFlight.value || !pollingTaskIds.value.length) { if (pollingTaskIds.value.length) scheduleNextPoll(); return } pollingInFlight.value = true; try { const { settledTaskIds } = await refreshTaskBatch(); if (settledTaskIds.length) await Promise.allSettled([loadHistory(), loadDashboard()]) } finally { pollingInFlight.value = false } if (pollingTaskIds.value.length) pollTimer.value = window.setTimeout(run, getPollIntervalMs()) }; if (immediate) void run(); else pollTimer.value = window.setTimeout(run, getPollIntervalMs()) } function ensurePolling(immediate = false) { scheduleNextPoll(immediate) } function stopPolling() { if (pollTimer.value) { window.clearTimeout(pollTimer.value); pollTimer.value = null } } -async function waitForTaskTerminal(taskId: number) { while (true) { const batch = await getShopMatchTasksBatch([taskId]); const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { taskSnapshots.value = { ...taskSnapshots.value, [taskId]: detail }; saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (status === 'SUCCESS' || status === 'FAILED') { removePollingTask(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return status } await new Promise((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) }) } } +async function waitForTaskTerminal(taskId: number) { while (true) { const batch = await getShopMatchTasksBatch([taskId]); const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { taskSnapshots.value = { ...taskSnapshots.value, [taskId]: detail }; saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await loadHistory(); await loadDashboard(); restoreScheduledDispatches(); return status } await new Promise((resolve) => { window.setTimeout(() => resolve(), getPollIntervalMs()) }) } } function resolvedTaskStatus(item: ShopMatchHistoryItem) { const taskId = normalizeTaskId(item.taskId); if (!taskId) return item.taskStatus || ''; return taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status || item.taskStatus || '' } function taskSnapshotOf(item: ShopMatchHistoryItem) { const taskId = normalizeTaskId(item.taskId); return taskId ? taskSnapshots.value[taskId] : undefined } function currentTaskStageText(item: ShopMatchHistoryItem) { const snapshot = taskSnapshotOf(item); const task = snapshot?.task; const stages = task?.scheduleStages || []; if (!stages.length) return ''; const total = stages.length; const activeIndex = typeof task?.activeStageIndex === 'number' ? task.activeStageIndex : undefined; const currentIndex = typeof task?.currentStageIndex === 'number' ? task.currentStageIndex : undefined; if (typeof activeIndex === 'number') return `执行进度: 第 ${activeIndex + 1}/${total} 次执行中`; if (typeof currentIndex === 'number') return `执行进度: 等待第 ${currentIndex + 1}/${total} 次`; return `执行进度: 共 ${total} 次`} function nextScheduledDisplay(item: ShopMatchHistoryItem) { const snapshot = taskSnapshotOf(item); const task = snapshot?.task; const stages = task?.scheduleStages || []; if (typeof task?.currentStageIndex === 'number') { const stage = stages.find((entry) => entry.stageIndex === task.currentStageIndex); if (stage?.scheduledAt) return formatTimeOnly(stage.scheduledAt) } if (item.scheduledAt) return formatTimeOnly(item.scheduledAt); return '' } -function statusText(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); if (status === 'SCHEDULED') return '待执行'; if (status === 'RUNNING') return '执行中'; if (status === 'SUCCESS') return '已完成'; if (status === 'FAILED') return '失败'; return item.success ? '已完成' : '未知' } -function statusClass(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return status === 'SUCCESS' ? 'success' : status === 'FAILED' ? 'failed' : 'running' } -function canDownload(item: ShopMatchHistoryItem) { return !!item.resultId && !!item.downloadUrl && resolvedTaskStatus(item) === 'SUCCESS' } +function statusText(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); if (status === 'SCHEDULED') return '待执行'; if (status === 'RUNNING') return '执行中'; if (status === 'SUCCESS' || status === 'COMPLETED') return '已完成'; if (status === 'FAILED') return '失败'; return item.success ? '已完成' : '未知' } +function statusClass(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return status === 'SUCCESS' || status === 'COMPLETED' ? 'success' : status === 'FAILED' ? 'failed' : 'running' } +function canDownload(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return !!item.resultId && !!item.downloadUrl && (status === 'SUCCESS' || status === 'COMPLETED') } async function downloadResult(item: ShopMatchHistoryItem) { if (!item.resultId) return; const api = getPywebviewApi(); if (!api?.save_file_from_url_new) { ElMessage.error('当前客户端未提供下载能力'); return } const url = getShopMatchResultDownloadUrl(item.resultId); const filename = item.outputFilename || `${item.shopName || 'result'}.xlsx`; const result = await api.save_file_from_url_new(url, filename); if (result.success) ElMessage.success(`已保存: ${result.path || filename}`); else if (result.error && result.error !== '用户取消') ElMessage.error(result.error) } -async function deleteTaskRecord(item: ShopMatchHistoryItem) { try { if (item.resultId) await deleteShopMatchHistory(item.resultId); else if (item.taskId) { await deleteShopMatchTask(item.taskId); removePollingTask(item.taskId) } await loadHistory(); await loadCandidates(); await loadDashboard() } catch (error) { ElMessage.error(error instanceof Error ? error.message : '删除失败') } } +async function deleteTaskRecord(item: ShopMatchHistoryItem) { + const taskId = normalizeTaskId(item.taskId) + const resultId = Number(item.resultId || 0) + try { + if (taskId > 0) { + await deleteShopMatchTask(taskId) + removePollingTask(taskId) + historyItems.value = historyItems.value.filter((row) => normalizeTaskId(row.taskId) !== taskId) + delete taskSnapshots.value[taskId] + saveTaskSnapshotsToStorage() + } else if (resultId > 0) { + await deleteShopMatchHistory(resultId) + historyItems.value = historyItems.value.filter((row) => Number(row.resultId || 0) !== resultId) + } else { + throw new Error('缺少可删除的任务标识') + } + await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) + } catch (error) { + ElMessage.error(error instanceof Error ? error.message : '删除失败') + } +} function formatMatchStatus(status?: string) { const value = (status || '').trim(); return { MATCHED: '已匹配', PENDING: '待匹配', CONFLICT: '需人工确认', INDEX_STALE: '索引过期' }[value] || value || '—' } function formatMatchRemark(row: ShopMatchShopQueueItem) { const message = (row.matchMessage || '').trim(); if (message) return message; if (row.matched && row.matchStatus === 'MATCHED') return '紫鸟索引已命中，可推送队列'; if (row.matched) return '已关联索引，请结合状态列查看是否可推送'; return '未命中或未就绪，请检查店铺名与索引刷新' } -async function pushToPythonQueue() { const api = getPywebviewApi(); if (!api?.enqueue_json) { ElMessage.error('当前客户端未提供 enqueue_json'); return } const matched = matchedItems.value.filter((item) => item.matched); if (!matched.length) { ElMessage.warning('请先匹配可用店铺'); return } if (!orderedCountryCodes.value.length) { ElMessage.warning('请至少勾选一个国家'); return } let scheduleValues: string[] | undefined; try { scheduleValues = parseScheduleValues() } catch (error) { ElMessage.error(error instanceof Error ? error.message : '定时配置无效'); return } pushing.value = true; queuePayloadText.value = ''; try { for (let index = 0; index < matched.length; index += 1) { const item = matched[index]; const created = await createShopMatchTask([item], orderedCountryCodes.value, scheduleValues); const taskId = created.taskId; const initialStatus = scheduleValues?.length ? 'SCHEDULED' : 'RUNNING'; const snapshot: ShopMatchTaskDetailVo = { task: { id: taskId, status: initialStatus, scheduledAt: scheduleValues?.[0], countryCodes: [...orderedCountryCodes.value], currentStageIndex: scheduleValues?.length ? 0 : undefined, activeStageIndex: undefined, scheduleStages: (scheduleValues || []).map((value, stageIndex) => ({ stageIndex, scheduledAt: value, status: stageIndex === 0 ? 'SCHEDULED' : 'PENDING' })) }, items: created.items }; taskSnapshots.value = { ...taskSnapshots.value, [taskId]: snapshot }; taskDetails.value = { ...taskDetails.value, [taskId]: initialStatus }; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); const createdItem = created.items?.[0]; if (!createdItem) continue; if (scheduleValues?.length) { scheduleDispatch(taskId, scheduleValues[0]); queuePushResult.value = `任务 ${taskId} 已创建，共 ${scheduleValues.length} 个执行时间点`; removeMatchedRowsLocally([item]); continue } const payload = buildQueuePayload(taskId, item, orderedCountryCodes.value); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) throw new Error(result?.error || `任务 ${taskId} 推送失败`); addPollingTask(taskId); ensurePolling(true); removeMatchedRowsLocally([item]); queuePushResult.value = matched.length > 1 ? `任务 ${taskId} 已入队，等待完成后继续推送下一条（${index + 1}/${matched.length}）` : `任务 ${taskId} 已入队，等待执行完成`; const finalStatus = await waitForTaskTerminal(taskId); if (finalStatus !== 'SUCCESS') { throw new Error(`任务 ${taskId} 执行失败，已停止后续店铺推送`) } queuePushResult.value = index + 1 < matched.length ? `任务 ${taskId} 已完成，继续推送下一条（${index + 1}/${matched.length}）` : `任务 ${taskId} 已完成` } restoreScheduledDispatches(); if (!scheduleValues?.length) ensurePolling(true); ElMessage.success(scheduleValues?.length ? '定时任务已创建，后续会按时间串行推入 Python 队列' : `已按顺序完成 ${matched.length} 条店铺推送`) } catch (error) { const message = error instanceof Error ? error.message : '推送失败'; queuePushResult.value = message; ElMessage.error(message) } finally { pushing.value = false } } +async function pushToPythonQueue() { const api = getPywebviewApi(); if (!api?.enqueue_json) { ElMessage.error('当前客户端未提供 enqueue_json'); return } const matched = matchedItems.value.filter((item) => item.matched); if (!matched.length) { ElMessage.warning('请先匹配可用店铺'); return } if (!orderedCountryCodes.value.length) { ElMessage.warning('请至少勾选一个国家'); return } let scheduleValues: string[] | undefined; try { scheduleValues = parseScheduleValues() } catch (error) { ElMessage.error(error instanceof Error ? error.message : '定时配置无效'); return } pushing.value = true; queuePayloadText.value = ''; try { for (let index = 0; index < matched.length; index += 1) { const item = matched[index]; const created = await createShopMatchTask([item], orderedCountryCodes.value, scheduleValues); const taskId = created.taskId; const initialStatus = scheduleValues?.length ? 'SCHEDULED' : 'RUNNING'; const snapshot: ShopMatchTaskDetailVo = { task: { id: taskId, status: initialStatus, scheduledAt: scheduleValues?.[0], countryCodes: [...orderedCountryCodes.value], currentStageIndex: scheduleValues?.length ? 0 : undefined, activeStageIndex: undefined, scheduleStages: (scheduleValues || []).map((value, stageIndex) => ({ stageIndex, scheduledAt: value, status: stageIndex === 0 ? 'SCHEDULED' : 'PENDING' })) }, items: created.items }; taskSnapshots.value = { ...taskSnapshots.value, [taskId]: snapshot }; taskDetails.value = { ...taskDetails.value, [taskId]: initialStatus }; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); const createdItem = created.items?.[0]; if (!createdItem) continue; if (scheduleValues?.length) { restoreScheduledDispatches(); queuePushResult.value = `任务 ${taskId} 已创建，共 ${scheduleValues.length} 个执行时间点`; removeMatchedRowsLocally([item]); continue } const payload = buildQueuePayload(taskId, item, orderedCountryCodes.value); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) throw new Error(result?.error || `任务 ${taskId} 推送失败`); addPollingTask(taskId); ensurePolling(true); removeMatchedRowsLocally([item]); queuePushResult.value = matched.length > 1 ? `任务 ${taskId} 已入队，等待完成后继续推送下一条（${index + 1}/${matched.length}）` : `任务 ${taskId} 已入队，等待执行完成`; const finalStatus = await waitForTaskTerminal(taskId); if (finalStatus !== 'SUCCESS') { throw new Error(`任务 ${taskId} 执行失败，已停止后续店铺推送`) } queuePushResult.value = index + 1 < matched.length ? `任务 ${taskId} 已完成，继续推送下一条（${index + 1}/${matched.length}）` : `任务 ${taskId} 已完成` } restoreScheduledDispatches(); if (!scheduleValues?.length) ensurePolling(true); ElMessage.success(scheduleValues?.length ? '定时任务已创建，后续会按时间串行推入 Python 队列' : `已按顺序完成 ${matched.length} 条店铺推送`) } catch (error) { const message = error instanceof Error ? error.message : '推送失败'; queuePushResult.value = message; ElMessage.error(message) } finally { pushing.value = false } } -onMounted(async () => { loadPollingIdsFromStorage(); loadTaskDetailsFromStorage(); loadTaskSnapshotsFromStorage(); loadMatchedItemsFromStorage(); syncPollingIdsWithTaskState(); await Promise.allSettled([loadCandidates(), loadCountryPreference(), loadHistory(), loadDashboard()]); restoreScheduledDispatches(); if (pollingTaskIds.value.length) ensurePolling(true) }) -onUnmounted(() => { stopPolling(); if (countryPrefSaveTimer) clearTimeout(countryPrefSaveTimer); for (const timer of dispatchTimers.values()) window.clearTimeout(timer); dispatchTimers.clear() }) +onMounted(async () => { loadPollingIdsFromStorage(); loadTaskDetailsFromStorage(); loadTaskSnapshotsFromStorage(); loadMatchedItemsFromStorage(); syncPollingIdsWithTaskState(); await Promise.allSettled([loadCandidates(), loadCountryPreference(), loadHistory(), loadDashboard()]); startScheduleHeartbeat(); window.addEventListener('focus', handleScheduleRecovery); document.addEventListener('visibilitychange', handleScheduleRecovery); restoreScheduledDispatches(); if (pollingTaskIds.value.length) ensurePolling(true) }) +onUnmounted(() => { stopPolling(); stopScheduleHeartbeat(); window.removeEventListener('focus', handleScheduleRecovery); document.removeEventListener('visibilitychange', handleScheduleRecovery); if (countryPrefSaveTimer) clearTimeout(countryPrefSaveTimer); for (const timer of dispatchTimers.values()) window.clearTimeout(timer); dispatchTimers.clear() })