diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index f27e03c..dbb0846 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 35267d2..607af5e 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 f008cb7..88c6d4e 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 e6a9c3c..b4f9fcf 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 6b6828d..62da219 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 bb13d93..f2d0e0c 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 2598af4..2e1286f 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 bf04417..1430a16 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/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java index 4cc94a4..521a10d 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -72,6 +72,7 @@ public class MartialMiniController extends BladeController { private final BladeRedis bladeRedis; private final IMartialResultService resultService; private final IMiniAuthService miniAuthService; + private final IMiniScoringService miniScoringService; private final IMartialRegistrationOrderService registrationOrderService; private final MartialScheduleStatusMapper scheduleStatusMapper; private final MartialScheduleGroupMapper scheduleGroupMapper; @@ -90,49 +91,7 @@ public class MartialMiniController extends BladeController { return miniAuthService.login(dto); } public R submitScore(@RequestBody org.springblade.modules.martial.pojo.dto.MiniScoreSubmitDTO dto) { - MartialScore score = new MartialScore(); - - // 将String类型的ID转换为Long,避免JavaScript大数精度丢失 - score.setAthleteId(parseLong(dto.getAthleteId())); - score.setJudgeId(parseLong(dto.getJudgeId())); - score.setScore(dto.getScore()); - score.setProjectId(parseLong(dto.getProjectId())); - score.setCompetitionId(parseLong(dto.getCompetitionId())); - score.setVenueId(parseLong(dto.getVenueId())); - score.setScheduleId(parseLong(dto.getScheduleId())); - score.setNote(dto.getNote()); - score.setScoreTime(LocalDateTime.now()); - - if (dto.getDeductions() != null && !dto.getDeductions().isEmpty()) { - // 将String类型的扣分项ID转换为Long - List deductionIds = dto.getDeductions().stream() - .map(this::parseLong) - .filter(id -> id != null) - .collect(Collectors.toList()); - score.setDeductionItems(com.alibaba.fastjson.JSON.toJSONString(deductionIds)); - } - - Long judgeId = parseLong(dto.getJudgeId()); - if (judgeId != null) { - var judge = judgeService.getById(judgeId); - if (judge != null) { - score.setJudgeName(judge.getName()); - } - } - - boolean success = scoreService.save(score); - - // 评分保存成功后,计算并更新选手总分 - if (success) { - Long athleteId = parseLong(dto.getAthleteId()); - Long projectId = parseLong(dto.getProjectId()); - Long venueId = parseLong(dto.getVenueId()); - if (athleteId != null && projectId != null) { - updateAthleteTotalScore(athleteId, projectId, venueId); - } - } - - return success ? R.success("评分提交成功") : R.fail("评分提交失败"); + return miniScoringService.submitScore(dto); } /**