diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 70509f4..c4026f8 100644 Binary files a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta and b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta index d4290e0..2f0145e 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta index c8e19a8..c660dcf 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index 5caf38f..c574ad4 100644 Binary files a/minio_data/.minio.sys/buckets/.usage.json/xl.meta and b/minio_data/.minio.sys/buckets/.usage.json/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta index e0dadbb..ccf3c65 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta index 2e13a90..62d96c7 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta index 21ece1f..83e765e 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta index c1a0dee..8b5753b 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta differ diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java index debbfa5..b0dfa0e 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java @@ -108,16 +108,16 @@ public class MartialScheduleArrangeServiceImpl implements IMartialScheduleArrang } // 5. 生成时间段网格 - List timeSlots = generateTimeSlots(competition); + List timeSlots = timeSlotGenerator.generate(competition); // 6. 自动分组 - List groups = autoGroupParticipants(athletes); + List groups = participantGroupingService.autoGroup(athletes); // 7. 验证容量是否足够 - validateCapacity(groups, venues, timeSlots); + venueAllocationService.validateCapacity(groups, venues, timeSlots); // 8. 分配场地和时间段(轮询均匀分配) - assignVenueAndTimeSlot(groups, venues, timeSlots); + venueAllocationService.allocate(groups, venues, timeSlots); // 8. 清空旧的编排数据 clearOldScheduleData(competitionId); @@ -202,60 +202,6 @@ public class MartialScheduleArrangeServiceImpl implements IMartialScheduleArrang } - /** - * Generate time slots for competition - * @deprecated Use TimeSlotGenerator.generate() directly - */ - @Deprecated - private List generateTimeSlots(MartialCompetition competition) { - return timeSlotGenerator.generate(competition); - } - - - - /** - * 获取项目的分组类别名称 - * @param project 项目 - * @return 分组类别名称: 男子/女子/混合/团体 - */ - - - /** - * Auto group participants - * @deprecated Use ParticipantGroupingService.autoGroup() directly - */ - @Deprecated - private List autoGroupParticipants(List athletes) { - return participantGroupingService.autoGroup(athletes); - } - - - /** - * 验证时间窗口容量是否足够容纳所有分组 - */ - /** - * Validate capacity - * @deprecated Use VenueAllocationService.validateCapacity() directly - */ - @Deprecated - private void validateCapacity(List groups, - List venues, - List timeSlots) { - venueAllocationService.validateCapacity(groups, venues, timeSlots); - } - - /** - * Assign venue and time slot - * @deprecated Use VenueAllocationService.allocate() directly - */ - @Deprecated - private void assignVenueAndTimeSlot(List groups, - List venues, - List timeSlots) { - venueAllocationService.allocate(groups, venues, timeSlots); - } - - private void clearOldScheduleData(Long competitionId) { // 删除旧的编排数据 LambdaQueryWrapper groupWrapper = new LambdaQueryWrapper<>();