From 93eb6b470773bc49ea6e1a9d4cbd914eb95d525b Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期二, 30 九月 2025 17:38:04 +0800
Subject: [PATCH] feat: 完善比赛晋级功能并清理测试文件
---
backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java | 199 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 141 insertions(+), 58 deletions(-)
diff --git a/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java b/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java
index 508e233..a0ad78b 100644
--- a/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java
+++ b/backend/src/main/java/com/rongyichuang/activity/service/ActivityService.java
@@ -10,12 +10,15 @@
import com.rongyichuang.activity.repository.ActivityJudgeRepository;
import com.rongyichuang.activity.repository.ActivityRepository;
import com.rongyichuang.judge.entity.Judge;
+import com.rongyichuang.player.repository.ActivityPlayerRepository;
import com.rongyichuang.judge.repository.JudgeRepository;
import com.rongyichuang.common.dto.PageRequest;
import com.rongyichuang.common.dto.PageResponse;
import com.rongyichuang.rating.entity.RatingScheme;
import com.rongyichuang.rating.repository.RatingSchemeRepository;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.ExampleMatcher;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -23,9 +26,12 @@
import org.springframework.util.StringUtils;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
import java.util.stream.Collectors;
@Service
@@ -44,21 +50,32 @@
@Autowired
private RatingSchemeRepository ratingSchemeRepository;
+ @Autowired
+ private ActivityPlayerRepository activityPlayerRepository;
+
/**
* 鍒嗛〉鏌ヨ姣旇禌鍒楄〃
*/
public PageResponse<ActivityResponse> findActivities(PageRequest pageRequest, String name) {
Pageable pageable = pageRequest.toPageable();
Page<Activity> page;
-
+
if (StringUtils.hasText(name)) {
- page = activityRepository.findByPidAndStateAndNameContainingOrderByCreateTimeDesc(0L, 1, name, pageable);
+ page = activityRepository.findByPidAndNameContainingOrderByCreateTimeDesc(0L, name, pageable);
} else {
- page = activityRepository.findByPidAndStateOrderByCreateTimeDesc(0L, 1, pageable);
+ // 鏌ヨ鎵�鏈変富娲诲姩锛坧id = 0锛�
+ page = activityRepository.findByPidOrderByCreateTimeDesc(0L, pageable);
}
-
+
List<ActivityResponse> content = page.getContent().stream()
- .map(ActivityResponse::new)
+ .map(activity -> {
+ ActivityResponse response = new ActivityResponse(activity);
+ // 璁剧疆鍙傝禌浜烘暟锛堝鏍搁�氳繃鐨勬姤鍚嶆暟閲忥級
+ Long playerCountLong = activityPlayerRepository.countByActivityId(activity.getId());
+ int playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
+ response.setPlayerCount(playerCount);
+ return response;
+ })
.collect(Collectors.toList());
return new PageResponse<>(content, page.getTotalElements(), page.getNumber(), page.getSize());
@@ -73,11 +90,23 @@
Activity activity = activityOpt.get();
ActivityResponse response = new ActivityResponse(activity);
+ // 璁剧疆鍙傝禌浜烘暟锛堝鏍搁�氳繃鐨勬姤鍚嶆暟閲忥級
+ Long playerCountLong = activityPlayerRepository.countByActivityId(activity.getId());
+ int playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
+ response.setPlayerCount(playerCount);
+
// 濡傛灉鏄瘮璧涳紝鍔犺浇鍏堕樁娈�
if (activity.isMainActivity()) {
List<Activity> stages = activityRepository.findByPidAndStateOrderByCreateTimeAsc(id, 1);
List<ActivityResponse> stageResponses = stages.stream()
- .map(ActivityResponse::new)
+ .map(stage -> {
+ ActivityResponse stageResponse = new ActivityResponse(stage);
+ // 璁剧疆闃舵鐨勫弬璧涗汉鏁�
+ Long stagePlayerCountLong = activityPlayerRepository.countByActivityId(stage.getId());
+ int stagePlayerCount = stagePlayerCountLong != null ? stagePlayerCountLong.intValue() : 0;
+ stageResponse.setPlayerCount(stagePlayerCount);
+ return stageResponse;
+ })
.collect(Collectors.toList());
response.setStages(stageResponses);
}
@@ -127,6 +156,21 @@
if (!schemeOpt.isPresent()) {
throw new RuntimeException("璇勫垎妯℃澘涓嶅瓨鍦�");
}
+ }
+
+ // 濡傛灉鏄瘮璧涳紝楠岃瘉蹇呴』鑷冲皯鏈変竴涓樁娈�
+ if (input.isMainActivity()) {
+ if (input.getStages() == null || input.getStages().isEmpty()) {
+ throw new RuntimeException("姣旇禌蹇呴』鑷冲皯鏈変竴涓樁娈�");
+ }
+
+ // 楠岃瘉闃舵鏁伴噺涓嶈秴杩�5涓�
+ if (input.getStages().size() > 5) {
+ throw new RuntimeException("姣旇禌闃舵鏁伴噺涓嶈兘瓒呰繃5涓�");
+ }
+
+ // 楠岃瘉sort_order杩炵画鎬�
+ validateSortOrderContinuity(input.getStages());
}
// 淇濆瓨姣旇禌
@@ -198,6 +242,7 @@
stage.setMatchTime(stageInput.getMatchTime());
stage.setAddress(stageInput.getAddress());
stage.setPlayerMax(stageInput.getPlayerMax());
+ stage.setSortOrder(stageInput.getSortOrder());
stage.setState(stageInput.getState());
// 闃舵缁ф壙姣旇禌鐨勬姤鍚嶆埅姝㈡椂闂�
@@ -246,7 +291,9 @@
} else {
// 涓烘瘡涓寚瀹氱殑闃舵鍒涘缓鍏宠仈
for (Long stageId : judgeInput.getStageIds()) {
- ActivityJudge activityJudge = new ActivityJudge(activityId, judgeInput.getJudgeId(), stageId);
+ // 濡傛灉stageId绛変簬褰撳墠姣旇禌ID锛岃〃绀鸿瘎濮旇礋璐ｆ暣涓瘮璧涳紝stage_id璁句负null
+ Long actualStageId = stageId.equals(activityId) ? null : stageId;
+ ActivityJudge activityJudge = new ActivityJudge(activityId, judgeInput.getJudgeId(), actualStageId);
activityJudgeRepository.save(activityJudge);
}
}
@@ -279,61 +326,46 @@
}
/**
- * 鑾峰彇鎵�鏈夋湁鏁堟瘮璧涘拰闃舵锛堢敤浜庝笅鎷夐�夋嫨锛�
+ * 鑾峰彇鎵�鏈夋湁鏁堜富姣旇禌锛堢敤浜庝笅鎷夐�夋嫨锛�
*/
public List<ActivityResponse> findAllActivitiesForSelection() {
- // 鑾峰彇鎵�鏈夋椿鍔紙鍖呮嫭姣旇禌鍜岄樁娈碉級
- List<Activity> activities = activityRepository.findByStateOrderByPidAscNameAsc(1);
+ // 鑾峰彇鎵�鏈夌姸鎬佷负1鐨勬椿鍔�
+ List<Activity> allActivities = activityRepository.findByStateOrderByPidAscNameAsc(1);
- // 鍒涘缓姣旇禌ID鍒版瘮璧涘璞＄殑鏄犲皠锛岀敤浜庡揩閫熸煡鎵剧埗姣旇禌
- Map<Long, Activity> mainActivityMap = activities.stream()
- .filter(activity -> activity.getPid() == 0)
- .collect(Collectors.toMap(Activity::getId, activity -> activity));
-
- // 杞崲涓篈ctivityResponse骞跺～鍏卲arent淇℃伅
- List<ActivityResponse> result = activities.stream()
- .map(activity -> {
- ActivityResponse response = new ActivityResponse(activity);
- // 濡傛灉鏄樁娈碉紙pid > 0锛夛紝濉厖parent淇℃伅
- if (activity.getPid() > 0) {
- Activity parentActivity = mainActivityMap.get(activity.getPid());
- if (parentActivity != null) {
- response.setParent(new ActivityResponse(parentActivity));
- }
- }
- return response;
- })
+ // 杩囨护锛氬彧淇濈暀姣旇禌闃舵锛坧id>0锛�
+ List<Activity> filteredActivities = allActivities.stream()
+ .filter(activity -> activity.getPid() > 0)
.collect(Collectors.toList());
- // 鑷畾涔夋帓搴忥細姣旇禌鍜屽叾闃舵鏀惧湪涓�璧�
- result.sort((a, b) -> {
- // 濡傛灉閮芥槸姣旇禌锛坧id=0锛夛紝鎸夊悕绉版帓搴�
- if (a.getPid() == 0 && b.getPid() == 0) {
- return a.getName().compareTo(b.getName());
- }
- // 濡傛灉閮芥槸闃舵锛屽厛鎸夌埗姣旇禌鍚嶇О鎺掑簭锛屽啀鎸夐樁娈靛悕绉版帓搴�
- if (a.getPid() > 0 && b.getPid() > 0) {
- String aParentName = a.getParent() != null ? a.getParent().getName() : "";
- String bParentName = b.getParent() != null ? b.getParent().getName() : "";
- int parentCompare = aParentName.compareTo(bParentName);
- if (parentCompare != 0) {
- return parentCompare;
+ // 杞崲涓篈ctivityResponse锛屽寘鍚埗姣旇禌淇℃伅
+ List<ActivityResponse> result = filteredActivities.stream()
+ .map(activity -> {
+ ActivityResponse response = new ActivityResponse(activity);
+ // 璁剧疆鍙傝禌浜烘暟锛堝鏍搁�氳繃鐨勬姤鍚嶆暟閲忥級
+ Long playerCountLong = activityPlayerRepository.countByActivityId(activity.getId());
+ int playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
+ response.setPlayerCount(playerCount);
+
+ // 璁剧疆鐖舵瘮璧涗俊鎭�
+ Optional<Activity> parentOpt = activityRepository.findById(activity.getPid());
+ if (parentOpt.isPresent()) {
+ Activity parent = parentOpt.get();
+ response.setParent(new ActivityResponse(parent));
+ }
+
+ return response;
+ })
+ .sorted((a, b) -> {
+ // 鍏堟寜鐖舵瘮璧涘悕绉版帓搴忥紝鍐嶆寜闃舵鍚嶇О鎺掑簭
+ if (a.getParent() != null && b.getParent() != null) {
+ int parentCompare = a.getParent().getName().compareTo(b.getParent().getName());
+ if (parentCompare != 0) {
+ return parentCompare;
+ }
}
return a.getName().compareTo(b.getName());
- }
- // 濡傛灉涓�涓槸姣旇禌锛屼竴涓槸闃舵
- if (a.getPid() == 0 && b.getPid() > 0) {
- String bParentName = b.getParent() != null ? b.getParent().getName() : "";
- int compare = a.getName().compareTo(bParentName);
- return compare <= 0 ? -1 : 1; // 姣旇禌鎺掑湪鍏堕樁娈靛墠闈�
- }
- if (a.getPid() > 0 && b.getPid() == 0) {
- String aParentName = a.getParent() != null ? a.getParent().getName() : "";
- int compare = aParentName.compareTo(b.getName());
- return compare < 0 ? -1 : 1; // 闃舵鎺掑湪鍏舵瘮璧涘悗闈�
- }
- return 0;
- });
+ })
+ .collect(Collectors.toList());
return result;
}
@@ -344,7 +376,14 @@
public List<ActivityResponse> findStagesByActivityId(Long activityId) {
List<Activity> stages = activityRepository.findByPidAndStateOrderByCreateTimeAsc(activityId, 1);
return stages.stream()
- .map(ActivityResponse::new)
+ .map(activity -> {
+ ActivityResponse response = new ActivityResponse(activity);
+ // 璁剧疆鍙傝禌浜烘暟锛堝鏍搁�氳繃鐨勬姤鍚嶆暟閲忥級
+ Long playerCountLong = activityPlayerRepository.countByActivityId(activity.getId());
+ int playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
+ response.setPlayerCount(playerCount);
+ return response;
+ })
.collect(Collectors.toList());
}
@@ -361,7 +400,14 @@
public List<ActivityResponse> findOngoingActivities() {
List<Activity> activities = activityRepository.findOngoingActivities();
return activities.stream()
- .map(ActivityResponse::new)
+ .map(activity -> {
+ ActivityResponse response = new ActivityResponse(activity);
+ // 璁剧疆鍙傝禌浜烘暟锛堝鏍搁�氳繃鐨勬姤鍚嶆暟閲忥級
+ Long playerCountLong = activityPlayerRepository.countByActivityId(activity.getId());
+ int playerCount = playerCountLong != null ? playerCountLong.intValue() : 0;
+ response.setPlayerCount(playerCount);
+ return response;
+ })
.collect(Collectors.toList());
}
@@ -391,7 +437,10 @@
Map<Long, List<Long>> judgeStageMap = activityJudges.stream()
.collect(Collectors.groupingBy(
ActivityJudge::getJudgeId,
- Collectors.mapping(ActivityJudge::getStageId, Collectors.toList())
+ Collectors.mapping(
+ aj -> aj.getStageId() != null ? aj.getStageId() : activityId, // 濡傛灉stage_id涓簄ull锛岃〃绀鸿礋璐ｆ暣涓瘮璧涳紝浣跨敤activityId
+ Collectors.toList()
+ )
));
// 鏌ヨ璇勫璇︾粏淇℃伅骞舵瀯寤哄搷搴�
@@ -416,4 +465,38 @@
return result;
}
+
+ /**
+ * 楠岃瘉闃舵鐨剆ort_order杩炵画鎬�
+ */
+ private void validateSortOrderContinuity(List<ActivityStageInput> stages) {
+ if (stages == null || stages.isEmpty()) {
+ return;
+ }
+
+ // 鏀堕泦鎵�鏈夌殑sortOrder鍊�
+ List<Integer> sortOrders = stages.stream()
+ .map(ActivityStageInput::getSortOrder)
+ .filter(Objects::nonNull)
+ .sorted()
+ .collect(Collectors.toList());
+
+ // 妫�鏌ユ槸鍚︿粠1寮�濮�
+ if (sortOrders.isEmpty() || sortOrders.get(0) != 1) {
+ throw new RuntimeException("闃舵鎺掑簭蹇呴』浠�1寮�濮�");
+ }
+
+ // 妫�鏌ヨ繛缁��
+ for (int i = 0; i < sortOrders.size(); i++) {
+ if (sortOrders.get(i) != i + 1) {
+ throw new RuntimeException("闃舵鎺掑簭蹇呴』杩炵画锛屼笉鑳借烦璺冿紙濡傦細1,2,3...锛�");
+ }
+ }
+
+ // 妫�鏌ユ槸鍚︽湁閲嶅鐨剆ortOrder
+ Set<Integer> uniqueSortOrders = new HashSet<>(sortOrders);
+ if (uniqueSortOrders.size() != sortOrders.size()) {
+ throw new RuntimeException("闃舵鎺掑簭涓嶈兘閲嶅");
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0