From ba94ceae1315174798ae1967ef62268c6d16cd5b Mon Sep 17 00:00:00 2001 From: Codex Assistant <codex@example.com> Date: 星期一, 06 十月 2025 22:07:06 +0800 Subject: [PATCH] feat: 评审与活动相关改动 - backend(GraphQL): Activity schema 增加 updateActivityState(id, state);实现 resolver/service 仅更新 state=2 作为逻辑删除 - backend(GraphQL): region.graphqls 新增 Query leafRegions - backend(GraphQL): player.graphqls 的 projectReviewApplications 增加可选参数 regionId - backend(Service): listProjectReviewApplications 绑定 regionId 参数,修复 QueryParameterException - frontend(web): 新增 api/activity.js 的 updateActivityState 并接入 activity-list 删除逻辑 - frontend(web): review-list.vue 权限仅校验登录,移除角色限制;查询参数修正为 name/regionId - frontend(web): 删除未引用的 ActivityList.vue - frontend(web): projectReviewNew.js GraphQL 查询增加 name 参数 --- backend/src/main/java/com/rongyichuang/common/api/MediaGraphqlApi.java | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/com/rongyichuang/common/api/MediaGraphqlApi.java b/backend/src/main/java/com/rongyichuang/common/api/MediaGraphqlApi.java index 542979a..4ad1c5a 100644 --- a/backend/src/main/java/com/rongyichuang/common/api/MediaGraphqlApi.java +++ b/backend/src/main/java/com/rongyichuang/common/api/MediaGraphqlApi.java @@ -85,12 +85,24 @@ r.setMediaType(m.getMediaType()); r.setTargetType(m.getTargetType()); r.setTargetId(m.getTargetId()); + r.setThumbPath(m.getThumbPath()); + r.setDuration(m.getDuration()); + r.setDescription(m.getDescription()); + // 杩藉姞 fullUrl锛堝墠绔篃鍙嚜琛屾嫾鎺ワ級 if (mediaBaseUrl != null && !mediaBaseUrl.isEmpty() && m.getPath() != null) { String base = mediaBaseUrl.endsWith("/") ? mediaBaseUrl.substring(0, mediaBaseUrl.length() - 1) : mediaBaseUrl; String p = m.getPath().startsWith("/") ? m.getPath() : ("/" + m.getPath()); r.setFullUrl(base + p); } + + // 杩藉姞 fullThumbUrl + if (mediaBaseUrl != null && !mediaBaseUrl.isEmpty() && m.getThumbPath() != null) { + String base = mediaBaseUrl.endsWith("/") ? mediaBaseUrl.substring(0, mediaBaseUrl.length() - 1) : mediaBaseUrl; + String p = m.getThumbPath().startsWith("/") ? m.getThumbPath() : ("/" + m.getThumbPath()); + r.setFullThumbUrl(base + p); + } + return r; } @@ -100,18 +112,37 @@ System.out.println("杈撳叆鍙傛暟: " + input); System.out.println("targetType: " + input.getTargetType()); System.out.println("targetId: " + input.getTargetId()); + System.out.println("thumbPath: " + input.getThumbPath()); try { - Media result = mediaService.saveMedia( - input.getName(), - input.getPath(), - input.getFileSize(), - input.getFileExt(), - input.getMediaType(), - input.getTargetType(), - input.getTargetId() - ); - System.out.println("淇濆瓨鎴愬姛锛屽獟浣揑D: " + result.getId()); + Media result; + + // 濡傛灉鏈夌缉鐣ュ浘璺緞锛屼娇鐢ㄦ敮鎸佺缉鐣ュ浘鐨勬柟娉� + if (input.getThumbPath() != null && !input.getThumbPath().trim().isEmpty()) { + result = mediaService.saveMedia( + input.getName(), + input.getPath(), + input.getFileSize(), + input.getFileExt(), + input.getMediaType(), + input.getTargetType(), + input.getTargetId(), + input.getThumbPath() + ); + System.out.println("淇濆瓨鎴愬姛锛堝惈缂╃暐鍥撅級锛屽獟浣揑D: " + result.getId()); + } else { + result = mediaService.saveMedia( + input.getName(), + input.getPath(), + input.getFileSize(), + input.getFileExt(), + input.getMediaType(), + input.getTargetType(), + input.getTargetId() + ); + System.out.println("淇濆瓨鎴愬姛锛屽獟浣揑D: " + result.getId()); + } + return result; } catch (Exception e) { System.err.println("淇濆瓨濯掍綋澶辫触: " + e.getMessage()); -- Gitblit v1.8.0