martial/martial-master
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(security): add validation and access guards for martial APIs

Browse Source
This commit is contained in:
hongjianli
2026-02-15 17:05:54 +08:00
parent ea91304a3f
commit d047e87de8
15 changed files with 247 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/springblade/modules/martial/controller/MartialCompetitionController.java
+15 -12
View File
@@ -1,23 +1,24 @@
package org.springblade.modules.martial.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.martial.pojo.entity.MartialAthlete;
import org.springblade.modules.martial.mapper.MartialAthleteMapper;
import org.springblade.modules.martial.pojo.dto.MartialCompetitionSubmitDTO;
import org.springblade.modules.martial.pojo.entity.MartialCompetition;
import org.springblade.modules.martial.service.IMartialAthleteService;
import org.springblade.modules.martial.mapper.MartialAthleteMapper;
import org.springblade.modules.martial.service.IMartialCompetitionService;
import org.springblade.modules.system.pojo.entity.User;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -27,8 +28,10 @@ import java.util.List;
*
* @author BladeX
*/
@Validated
@RestController
@AllArgsConstructor
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@RequestMapping("/martial/competition")
@Tag(name = "赛事管理", description = "赛事信息管理接口")
public class MartialCompetitionController extends BladeController {
@@ -44,7 +47,6 @@ public class MartialCompetitionController extends BladeController {
public R<MartialCompetition> detail(@RequestParam Long id) {
MartialCompetition detail = competitionService.getById(id);
if (detail != null) {
// Count distinct participants by id_card
Long cnt = ((MartialAthleteMapper) martialAthleteService.getBaseMapper()).countDistinctParticipants(detail.getId());
detail.setTotalParticipants(cnt != null ? cnt.intValue() : 0);
}
@@ -58,9 +60,8 @@ public class MartialCompetitionController extends BladeController {
@Operation(summary = "分页列表", description = "分页查询")
public R<IPage<MartialCompetition>> list(MartialCompetition competition, Query query) {
IPage<MartialCompetition> pages = competitionService.page(Condition.getPage(query), Condition.getQueryWrapper(competition));
List<MartialCompetition> pagelist = pages.getRecords();
for (MartialCompetition martialCompetition : pagelist) {
// Count distinct participants by id_card
List<MartialCompetition> pageList = pages.getRecords();
for (MartialCompetition martialCompetition : pageList) {
Long cnt = ((MartialAthleteMapper) martialAthleteService.getBaseMapper()).countDistinctParticipants(martialCompetition.getId());
martialCompetition.setTotalParticipants(cnt != null ? cnt.intValue() : 0);
}
@@ -71,8 +72,10 @@ public class MartialCompetitionController extends BladeController {
* 新增或修改
*/
@PostMapping("/submit")
@Operation(summary = "新增或修改", description = "传入实体")
public R<MartialCompetition> submit(@RequestBody MartialCompetition competition) {
@Operation(summary = "新增或修改", description = "传入提交DTO")
public R<MartialCompetition> submit(@Valid @RequestBody MartialCompetitionSubmitDTO submitDTO) {
MartialCompetition competition = new MartialCompetition();
BeanUtils.copyProperties(submitDTO, competition);
competitionService.saveOrUpdate(competition);
return R.data(competition);
}
src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java
+26 -5
View File
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
@@ -37,6 +38,7 @@ import org.springblade.modules.martial.mapper.MartialScheduleStatusMapper;
import org.springblade.modules.martial.mapper.MartialScheduleGroupMapper;
import org.springblade.modules.martial.mapper.MartialScheduleParticipantMapper;
import org.springblade.modules.martial.mapper.MartialScheduleDetailMapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
@@ -59,6 +61,7 @@ import java.util.stream.Collectors;
* @author BladeX
*/
@Slf4j
@Validated
@RestController
@AllArgsConstructor
@RequestMapping("/mini")
@@ -93,7 +96,7 @@ public class MartialMiniController extends BladeController {
*/
@PostMapping("/login")
@Operation(summary = "登录验证", description = "使用比赛编码和邀请码登录")
public R<MiniLoginVO> login(@RequestBody MiniLoginDTO dto) {
public R<MiniLoginVO> login(@Valid @RequestBody MiniLoginDTO dto) {
return miniAuthService.login(dto);
}
@PostMapping("/score/submit")
@@ -101,7 +104,7 @@ public class MartialMiniController extends BladeController {
public R submitScore(
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "Blade-Auth", required = false) String bladeAuthToken,
@RequestBody org.springblade.modules.martial.pojo.dto.MiniScoreSubmitDTO dto
@Valid @RequestBody org.springblade.modules.martial.pojo.dto.MiniScoreSubmitDTO dto
) {
if (dto == null) {
return R.fail("请求体不能为空");
@@ -510,7 +513,25 @@ public class MartialMiniController extends BladeController {
*/
@PutMapping("/score/modify")
@Operation(summary = "修改评分", description = "主裁判修改选手总分")
public R modifyScore(@RequestBody MiniScoreModifyDTO dto) {
public R modifyScore(
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "Blade-Auth", required = false) String bladeAuthToken,
@Valid @RequestBody MiniScoreModifyDTO dto
) {
JudgeAuthContext authContext = resolveJudgeAuthContext(authorization, bladeAuthToken);
if (authContext == null || authContext.getJudgeId() == null) {
return R.fail("登录状态无效或已过期");
}
if (!authContext.isChiefJudge()) {
log.warn("主裁判改分拒绝：无主裁判权限，judgeId={}, role={}, refereeType={}",
authContext.getJudgeId(), authContext.getRole(), authContext.getRefereeType());
return R.fail("无主裁判权限");
}
if (dto.getModifierId() != null && !dto.getModifierId().equals(authContext.getJudgeId())) {
log.warn("主裁判改分身份字段不匹配，已忽略请求体modifierId，payloadModifierId={}, authJudgeId={}", dto.getModifierId(), authContext.getJudgeId());
}
// 向后兼容：忽略请求体 modifierId，以 token 身份为准
dto.setModifierId(authContext.getJudgeId());
boolean success = scoreService.modifyScoreByAdmin(dto);
return success ? R.success("修改成功") : R.fail("修改失败");
}
@@ -803,7 +824,7 @@ public class MartialMiniController extends BladeController {
public R confirmByChiefJudge(
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "Blade-Auth", required = false) String bladeAuthToken,
@RequestBody ChiefJudgeConfirmDTO dto
@Valid @RequestBody ChiefJudgeConfirmDTO dto
) {
if (dto == null) {
return R.fail("参数错误");
@@ -838,7 +859,7 @@ public class MartialMiniController extends BladeController {
public R confirmByGeneralJudge(
@RequestHeader(value = "Authorization", required = false) String authorization,
@RequestHeader(value = "Blade-Auth", required = false) String bladeAuthToken,
@RequestBody GeneralJudgeConfirmDTO dto
@Valid @RequestBody GeneralJudgeConfirmDTO dto
) {
if (dto == null) {
return R.fail("参数错误");
src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java
+10 -1
View File
@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.martial.pojo.entity.MartialAthlete;
import org.springblade.modules.martial.pojo.entity.MartialCompetition;
@@ -27,6 +30,7 @@ import org.springblade.modules.martial.service.IMartialRegistrationOrderService;
import org.springblade.modules.martial.service.IMartialTeamService;
import org.springblade.modules.martial.mapper.MartialTeamMemberMapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
@@ -35,6 +39,7 @@ import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@Validated
@RestController
@AllArgsConstructor
@RequestMapping("/martial/registrationOrder")
@@ -49,12 +54,14 @@ public class MartialRegistrationOrderController extends BladeController {
private final MartialTeamMemberMapper teamMemberMapper;
@GetMapping("/detail")
@PreAuth(RoleConstant.HAS_ROLE_USER)
@Operation(summary = "详情", description = "传入ID")
public R detail(@RequestParam Long id) {
return R.data(registrationOrderService.getDetailWithRelations(id));
}
@GetMapping("/list")
@PreAuth(RoleConstant.HAS_ROLE_USER)
@Operation(summary = "分页列表", description = "分页查询当前用户的报名记录")
public R<IPage<MartialRegistrationOrderVO>> list(MartialRegistrationOrder registrationOrder, Query query) {
Long userId = AuthUtil.getUserId();
@@ -67,6 +74,7 @@ public class MartialRegistrationOrderController extends BladeController {
}
@GetMapping("/organization-stats")
@PreAuth(RoleConstant.HAS_ROLE_USER)
@Operation(summary = "单位统计", description = "按单位统计运动员、项目、金额")
public R<List<OrganizationStatsVO>> getOrganizationStats(@RequestParam Long competitionId) {
log.info("获取单位统计: competitionId={}", competitionId);
@@ -253,9 +261,10 @@ public class MartialRegistrationOrderController extends BladeController {
}
@PostMapping("/submit")
@PreAuth(RoleConstant.HAS_ROLE_USER)
@Operation(summary = "提交报名", description = "提交报名订单并关联选手或集体")
@Transactional(rollbackFor = Exception.class)
public R submit(@RequestBody RegistrationSubmitDTO dto) {
public R submit(@Valid @RequestBody RegistrationSubmitDTO dto) {
log.info("=== 提交报名订单 ===");
log.info("订单号: {}", dto.getOrderNo());
log.info("赛事ID: {}", dto.getCompetitionId());
src/main/java/org/springblade/modules/martial/controller/MartialScheduleArrangeController.java
+11 -5
View File
@@ -2,18 +2,22 @@ package org.springblade.modules.martial.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.modules.martial.config.ScheduleConfig;
import org.springblade.modules.martial.pojo.dto.MoveScheduleGroupDTO;
import org.springblade.modules.martial.pojo.dto.SaveScheduleDraftDTO;
import org.springblade.modules.martial.pojo.dto.ScheduleResultDTO;
import org.springblade.modules.martial.service.IMartialScheduleArrangeService;
import org.springblade.modules.martial.service.IMartialScheduleService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -25,8 +29,10 @@ import java.util.Map;
* @author BladeX
*/
@Slf4j
@Validated
@RestController
@AllArgsConstructor
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@RequestMapping("/martial/schedule")
@Tag(name = "赛程编排管理", description = "赛程自动编排接口")
public class MartialScheduleArrangeController extends BladeController {
@@ -72,7 +78,7 @@ public class MartialScheduleArrangeController extends BladeController {
*/
@PostMapping("/save-draft")
@Operation(summary = "保存编排草稿", description = "传入编排草稿数据")
public R saveDraftSchedule(@RequestBody SaveScheduleDraftDTO dto) {
public R saveDraftSchedule(@Valid @RequestBody SaveScheduleDraftDTO dto) {
try {
boolean success = scheduleService.saveDraftSchedule(dto);
return success ? R.success("草稿保存成功") : R.fail("草稿保存失败");
@@ -87,7 +93,7 @@ public class MartialScheduleArrangeController extends BladeController {
*/
@PostMapping("/save-and-lock")
@Operation(summary = "完成编排并锁定", description = "传入赛事ID")
public R saveAndLock(@RequestBody SaveScheduleDraftDTO dto) {
public R saveAndLock(@Valid @RequestBody SaveScheduleDraftDTO dto) {
try {
BladeUser user = AuthUtil.getUser();
String userId = user != null ? user.getUserName() : "system";
@@ -120,7 +126,7 @@ public class MartialScheduleArrangeController extends BladeController {
*/
@PostMapping("/move-group")
@Operation(summary = "移动赛程分组", description = "将分组移动到指定场地和时间段")
public R moveGroup(@RequestBody MoveScheduleGroupDTO dto) {
public R moveGroup(@Valid @RequestBody MoveScheduleGroupDTO dto) {
try {
boolean success = scheduleService.moveScheduleGroup(dto);
return success ? R.success("分组移动成功") : R.fail("分组移动失败");
@@ -154,7 +160,7 @@ public class MartialScheduleArrangeController extends BladeController {
*/
@PostMapping("/adjust-order")
@Operation(summary = "调整出场顺序", description = "调整参赛者的出场顺序")
public R adjustOrder(@RequestBody org.springblade.modules.martial.pojo.dto.AdjustOrderDTO dto) {
public R adjustOrder(@Valid @RequestBody org.springblade.modules.martial.pojo.dto.AdjustOrderDTO dto) {
try {
boolean success = scheduleService.adjustOrder(dto);
return success ? R.success("顺序调整成功") : R.fail("顺序调整失败");
@@ -169,7 +175,7 @@ public class MartialScheduleArrangeController extends BladeController {
*/
@PostMapping("/save-dispatch")
@Operation(summary = "批量保存调度", description = "批量保存调度调整")
public R saveDispatch(@RequestBody org.springblade.modules.martial.pojo.dto.SaveDispatchDTO dto) {
public R saveDispatch(@Valid @RequestBody org.springblade.modules.martial.pojo.dto.SaveDispatchDTO dto) {
try {
boolean success = scheduleService.saveDispatch(dto);
return success ? R.success("调度保存成功") : R.fail("调度保存失败");
src/main/java/org/springblade/modules/martial/pojo/dto/AdjustOrderDTO.java
+5
View File
@@ -1,6 +1,8 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
@@ -15,18 +17,21 @@ public class AdjustOrderDTO {
/**
* 编排明细ID
*/
@NotNull(message = "编排明细ID不能为空")
@Schema(description = "编排明细ID")
private Long detailId;
/**
* 参赛者记录ID
*/
@NotNull(message = "参赛者记录ID不能为空")
@Schema(description = "参赛者记录ID")
private Long participantId;
/**
* 调整动作
*/
@NotBlank(message = "调整动作不能为空")
@Schema(description = "调整动作(move_up=上移, move_down=下移, swap=交换)")
private String action;
src/main/java/org/springblade/modules/martial/pojo/dto/ChiefJudgeConfirmDTO.java
+3 -1
View File
@@ -1,6 +1,7 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import java.math.BigDecimal;
@@ -12,10 +13,11 @@ import java.math.BigDecimal;
@Schema(description = "主裁判确认评分DTO")
public class ChiefJudgeConfirmDTO {
@NotBlank(message = "成绩ID不能为空")
@Schema(description = "成绩ID")
private String resultId;
@Schema(description = "主裁判ID")
@Schema(description = "主裁判ID（兼容字段，实际以后端token身份为准）")
private String chiefJudgeId;
@Schema(description = "确认/修改后的分数（null表示直接确认原分数）")
src/main/java/org/springblade/modules/martial/pojo/dto/GeneralJudgeConfirmDTO.java
+3 -1
View File
@@ -1,6 +1,7 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import java.math.BigDecimal;
@@ -12,10 +13,11 @@ import java.math.BigDecimal;
@Schema(description = "总裁确认评分DTO")
public class GeneralJudgeConfirmDTO {
@NotBlank(message = "成绩ID不能为空")
@Schema(description = "成绩ID")
private String resultId;
@Schema(description = "总裁ID")
@Schema(description = "总裁ID（兼容字段，实际以后端token身份为准）")
private String generalJudgeId;
@Schema(description = "确认/修改后的分数（null表示直接确认原分数）")
src/main/java/org/springblade/modules/martial/pojo/dto/MartialCompetitionSubmitDTO.java
+87
View File
@@ -0,0 +1,87 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 赛事提交DTO（用于替代实体直收，避免越权字段写入）
*/
@Data
@Schema(description = "赛事提交DTO")
public class MartialCompetitionSubmitDTO implements Serializable {
private static final long serialVersionUID = 1L;
@Schema(description = "赛事ID（更新时传）")
private Long id;
@NotBlank(message = "赛事名称不能为空")
@Schema(description = "赛事名称")
private String competitionName;
@NotBlank(message = "赛事编码不能为空")
@Schema(description = "赛事编码")
private String competitionCode;
@Schema(description = "主办单位")
private String organizer;
@Schema(description = "地区")
private String location;
@Schema(description = "详细地点")
private String venue;
@Schema(description = "报名开始时间")
private LocalDateTime registrationStartTime;
@Schema(description = "报名结束时间")
private LocalDateTime registrationEndTime;
@Schema(description = "比赛开始时间")
private LocalDateTime competitionStartTime;
@Schema(description = "比赛结束时间")
private LocalDateTime competitionEndTime;
@Schema(description = "赛事简介")
private String introduction;
@Schema(description = "宣传图片(JSON数组)")
private String posterImages;
@Schema(description = "联系人")
private String contactPerson;
@Schema(description = "联系电话")
private String contactPhone;
@Schema(description = "联系邮箱")
private String contactEmail;
@Schema(description = "竞赛规则")
private String rules;
@Schema(description = "参赛要求")
private String requirements;
@Schema(description = "奖项设置")
private String awards;
@Schema(description = "规程文件(JSON数组)")
private String regulationFiles;
@Schema(description = "报名总人数")
private Integer totalParticipants;
@Schema(description = "报名总金额")
private BigDecimal totalAmount;
@Schema(description = "是否精品：1是，2否")
private Integer isCompeBoutique;
}
src/main/java/org/springblade/modules/martial/pojo/dto/MiniLoginDTO.java
+3
View File
@@ -1,6 +1,7 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import java.io.Serializable;
@@ -16,9 +17,11 @@ public class MiniLoginDTO implements Serializable {
private static final long serialVersionUID = 1L;
@NotBlank(message = "比赛编码不能为空")
@Schema(description = "比赛编码")
private String matchCode;
@NotBlank(message = "邀请码不能为空")
@Schema(description = "邀请码")
private String inviteCode;
src/main/java/org/springblade/modules/martial/pojo/dto/MiniScoreModifyDTO.java
+9 -1
View File
@@ -1,6 +1,9 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.io.Serializable;
@@ -17,18 +20,23 @@ public class MiniScoreModifyDTO implements Serializable {
private static final long serialVersionUID = 1L;
@NotNull(message = "选手ID不能为空")
@Schema(description = "选手ID")
private Long athleteId;
@Schema(description = "修改者ID（主裁判ID）")
@Schema(description = "修改者ID（主裁判ID，兼容字段，实际以后端token身份为准）")
private Long modifierId;
@NotNull(message = "修改后的分数不能为空")
@DecimalMin(value = "5.000", message = "修改分数不能低于5.000")
@DecimalMax(value = "10.000", message = "修改分数不能高于10.000")
@Schema(description = "修改后的分数")
private BigDecimal modifiedScore;
@Schema(description = "修改原因/备注")
private String note;
@NotNull(message = "场地ID不能为空")
@Schema(description = "场地ID")
private Long venueId;
}
src/main/java/org/springblade/modules/martial/pojo/dto/MiniScoreSubmitDTO.java
+12 -1
View File
@@ -1,6 +1,10 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.io.Serializable;
@@ -20,12 +24,16 @@ public class MiniScoreSubmitDTO implements Serializable {
private static final long serialVersionUID = 1L;
@NotBlank(message = "选手ID不能为空")
@Schema(description = "选手ID")
private String athleteId;
@Schema(description = "评委ID")
@Schema(description = "评委ID（兼容字段，实际以后端token身份为准）")
private String judgeId;
@NotNull(message = "评分不能为空")
@DecimalMin(value = "5.000", message = "评分不能低于5.000")
@DecimalMax(value = "10.000", message = "评分不能高于10.000")
@Schema(description = "评分")
private BigDecimal score;
@@ -35,12 +43,15 @@ public class MiniScoreSubmitDTO implements Serializable {
@Schema(description = "备注")
private String note;
@NotBlank(message = "项目ID不能为空")
@Schema(description = "项目ID")
private String projectId;
@NotBlank(message = "赛事ID不能为空")
@Schema(description = "赛事ID")
private String competitionId;
@NotBlank(message = "场地ID不能为空")
@Schema(description = "场地ID")
private String venueId;
src/main/java/org/springblade/modules/martial/pojo/dto/MoveScheduleGroupDTO.java
+6
View File
@@ -1,6 +1,8 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
/**
@@ -15,18 +17,22 @@ public class MoveScheduleGroupDTO {
/**
* 分组ID
*/
@NotNull(message = "分组ID不能为空")
@Schema(description = "分组ID")
private Long groupId;
/**
* 目标场地ID
*/
@NotNull(message = "目标场地ID不能为空")
@Schema(description = "目标场地ID")
private Long targetVenueId;
/**
* 目标时间段索引
*/
@NotNull(message = "目标时间段索引不能为空")
@Min(value = 0, message = "目标时间段索引不能小于0")
@Schema(description = "目标时间段索引(0=第1天上午,1=第1天下午,2=第2天上午...)")
private Integer targetTimeSlotIndex;
src/main/java/org/springblade/modules/martial/pojo/dto/RegistrationSubmitDTO.java
+9 -1
View File
@@ -1,6 +1,9 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.math.BigDecimal;
@@ -9,12 +12,15 @@ import java.math.BigDecimal;
@Schema(description = "报名提交数据")
public class RegistrationSubmitDTO {
@NotBlank(message = "订单号不能为空")
@Schema(description = "订单号")
private String orderNo;
@NotNull(message = "赛事ID不能为空")
@Schema(description = "赛事ID")
private Long competitionId;
@NotBlank(message = "项目ID列表不能为空")
@Schema(description = "项目ID列表")
private String projectIds;
@@ -24,10 +30,12 @@ public class RegistrationSubmitDTO {
@Schema(description = "集体ID列表（集体项目）")
private String teamIds;
@NotBlank(message = "联系电话不能为空")
@Schema(description = "联系电话")
private String contactPhone;
@NotNull(message = "总金额不能为空")
@DecimalMin(value = "0.00", message = "总金额不能为负数")
@Schema(description = "总金额")
private BigDecimal totalAmount;
}
src/main/java/org/springblade/modules/martial/pojo/dto/SaveDispatchDTO.java
+13
View File
@@ -1,6 +1,8 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
@@ -17,18 +19,21 @@ public class SaveDispatchDTO {
/**
* 赛事ID
*/
@NotNull(message = "赛事ID不能为空")
@Schema(description = "赛事ID")
private Long competitionId;
/**
* 调整列表
*/
@Valid
@Schema(description = "调整列表")
private List<DetailAdjustment> adjustments;
/**
* 分组排序列表
*/
@Valid
@Schema(description = "分组排序列表")
private List<GroupOrder> groupOrders;
@@ -42,12 +47,14 @@ public class SaveDispatchDTO {
/**
* 编排明细ID
*/
@NotNull(message = "编排明细ID不能为空")
@Schema(description = "编排明细ID")
private Long detailId;
/**
* 参赛者列表
*/
@Valid
@Schema(description = "参赛者列表")
private List<ParticipantOrder> participants;
@@ -63,24 +70,28 @@ public class SaveDispatchDTO {
/**
* 分组ID
*/
@NotNull(message = "分组ID不能为空")
@Schema(description = "分组ID")
private Long groupId;
/**
* 分组顺序
*/
@NotNull(message = "分组顺序不能为空")
@Schema(description = "分组顺序")
private Integer groupOrder;
/**
* 场地ID
*/
@NotNull(message = "场地ID不能为空")
@Schema(description = "场地ID")
private Long venueId;
/**
* 时间段索引
*/
@NotNull(message = "时间段索引不能为空")
@Schema(description = "时间段索引")
private Integer timeSlotIndex;
@@ -96,12 +107,14 @@ public class SaveDispatchDTO {
/**
* 参赛者记录ID
*/
@NotNull(message = "参赛者记录ID不能为空")
@Schema(description = "参赛者记录ID")
private Long id;
/**
* 出场顺序
*/
@NotNull(message = "出场顺序不能为空")
@Schema(description = "出场顺序")
private Integer performanceOrder;
src/main/java/org/springblade/modules/martial/pojo/dto/SaveScheduleDraftDTO.java
+6
View File
@@ -1,6 +1,9 @@
package org.springblade.modules.martial.pojo.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.io.Serializable;
@@ -20,6 +23,7 @@ public class SaveScheduleDraftDTO implements Serializable {
/**
* 赛事ID
*/
@NotNull(message = "赛事ID不能为空")
@Schema(description = "赛事ID")
private Long competitionId;
@@ -32,6 +36,8 @@ public class SaveScheduleDraftDTO implements Serializable {
/**
* 竞赛分组数据
*/
@NotEmpty(message = "竞赛分组数据不能为空")
@Valid
@Schema(description = "竞赛分组数据")
private List<CompetitionGroupDTO> competitionGroups;