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/judge/service/JudgeService.java | 77 +++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/rongyichuang/judge/service/JudgeService.java b/backend/src/main/java/com/rongyichuang/judge/service/JudgeService.java index a0f5dc2..c4d82ec 100644 --- a/backend/src/main/java/com/rongyichuang/judge/service/JudgeService.java +++ b/backend/src/main/java/com/rongyichuang/judge/service/JudgeService.java @@ -2,6 +2,7 @@ import com.rongyichuang.judge.dto.request.JudgeInput; import com.rongyichuang.judge.dto.response.JudgeResponse; +import com.rongyichuang.judge.dto.response.JudgeStatsResponse; import com.rongyichuang.judge.entity.Judge; import com.rongyichuang.tag.entity.Tag; import com.rongyichuang.judge.repository.JudgeRepository; @@ -12,13 +13,15 @@ import com.rongyichuang.common.service.MediaService; import com.rongyichuang.common.exception.BusinessException; import com.rongyichuang.common.enums.MediaTargetType; +import com.rongyichuang.common.util.UserContextUtil; import com.rongyichuang.tag.repository.TagRepository; import com.rongyichuang.user.service.UserService; import com.rongyichuang.user.entity.User; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Sort; -import org.springframework.data.domain.Sort; +import org.springframework.jdbc.core.JdbcTemplate; +import java.util.Optional; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.StringUtils; import org.slf4j.Logger; @@ -39,18 +42,23 @@ private final MediaRepository mediaRepository; private final MediaService mediaService; private final UserService userService; + private final JdbcTemplate jdbcTemplate; + private final UserContextUtil userContextUtil; @Value("${app.media-url}") private String mediaBaseUrl; public JudgeService(JudgeRepository judgeRepository, TagRepository tagRepository, MediaRepository mediaRepository, MediaService mediaService, - UserService userService) { + UserService userService, JdbcTemplate jdbcTemplate, + UserContextUtil userContextUtil) { this.judgeRepository = judgeRepository; this.tagRepository = tagRepository; this.mediaRepository = mediaRepository; this.mediaService = mediaService; this.userService = userService; + this.jdbcTemplate = jdbcTemplate; + this.userContextUtil = userContextUtil; } public List<JudgeResponse> findAll() { @@ -71,6 +79,71 @@ .orElse(null); } + /** + * 鏍规嵁鐢ㄦ埛ID鑾峰彇璇勫淇℃伅 + */ + public Judge findByUserId(Long userId) { + Optional<Judge> judge = judgeRepository.findByUserId(userId); + return judge.orElse(null); + } + + /** + * 鑾峰彇褰撳墠璇勫鐨勭粺璁℃暟鎹� + */ + public JudgeStatsResponse getJudgeStats() { + log.info("鑾峰彇璇勫缁熻鏁版嵁"); + + Long currentJudgeId = userContextUtil.getCurrentJudgeId(); + if (currentJudgeId == null) { + throw new RuntimeException("褰撳墠鐢ㄦ埛涓嶆槸璇勫锛屾棤娉曟煡璇㈣瘎瀹$粺璁�"); + } + + // 鏌ヨ鎴戞湭璇勫鐨勬暟閲� + String unReviewedSql = "SELECT COUNT(*) FROM t_activity_player ap " + + "WHERE EXISTS (" + + " SELECT 1 FROM t_activity_judge aj " + + " WHERE ap.activity_id = aj.activity_id " + + " AND ap.stage_id = aj.stage_id " + + " AND aj.judge_id = ? " + + ") " + + "AND NOT EXISTS (" + + " SELECT 1 FROM t_activity_player_rating apr " + + " WHERE ap.id = apr.activity_player_id " + + " AND apr.judge_id = ? " + + " AND apr.state = 1 " + + ") " + + "AND ap.state = 1"; + Integer unReviewedCount = jdbcTemplate.queryForObject(unReviewedSql, Integer.class, currentJudgeId, currentJudgeId); + + // 鏌ヨ鎴戝凡璇勫鐨勬暟閲� + String reviewedSql = "SELECT COUNT(*) FROM t_activity_player ap " + + "WHERE EXISTS (" + + " SELECT 1 FROM t_activity_judge aj " + + " WHERE ap.activity_id = aj.activity_id " + + " AND ap.stage_id = aj.stage_id " + + " AND aj.judge_id = ? " + + ") " + + "AND EXISTS (" + + " SELECT 1 FROM t_activity_player_rating apr " + + " WHERE ap.id = apr.activity_player_id " + + " AND apr.judge_id = ? " + + " AND apr.state = 1 " + + ") " + + "AND ap.state = 1"; + Integer reviewedCount = jdbcTemplate.queryForObject(reviewedSql, Integer.class, currentJudgeId, currentJudgeId); + + // 璁$畻鎬绘暟 + Integer totalCount = (unReviewedCount != null ? unReviewedCount : 0) + (reviewedCount != null ? reviewedCount : 0); + + log.info("璇勫缁熻鏁版嵁 - 寰呰瘎瀹�: {}, 宸茶瘎瀹�: {}, 鎬绘暟: {}", unReviewedCount, reviewedCount, totalCount); + + return new JudgeStatsResponse( + unReviewedCount != null ? unReviewedCount : 0, + reviewedCount != null ? reviewedCount : 0, + totalCount + ); + } + @Transactional public JudgeResponse save(JudgeInput input) { Judge judge; -- Gitblit v1.8.0