浏览代码

refactor(system): 优化消息更新和比赛 DTO

- 移除 MessagesMapper.xml 中的多余逗号
- 在 TournamentsDto 中添加多个非空校验注解- 添加 AutoMapper 注解和 EqualsAndHashCode 注解
fugui001 5 月之前
父节点
当前提交
7e687b0e4f

+ 8 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/dto/TournamentsDto.java

@@ -1,11 +1,15 @@
 package org.dromara.business.domain.dto;
 
+import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.business.domain.BlindLevels;
 
 import java.util.List;
-
+@EqualsAndHashCode(callSuper = false)
+@AutoMapper(target = BlindLevels.class, reverseConvertGenerate = false)
 @Data
 public class TournamentsDto {
 
@@ -18,6 +22,7 @@ public class TournamentsDto {
     @NotNull(message = "比赛开始时间不能为空")
     private String startTime;
 
+    @NotBlank(message = "比赛类型不能为空")
     private Long gameType;
     private Long startingChips;
     private Long levelDuration;
@@ -31,6 +36,7 @@ public class TournamentsDto {
     @NotNull(message = "报名时间不能为空")
     private Long signTime;
 
+    @NotNull(message = "报名条件不能为空")
     private Long itemsId;
 
     @NotNull(message = "报名条件数量不能为空")
@@ -39,6 +45,7 @@ public class TournamentsDto {
     @NotNull(message = "盲注表不能为空")
     private Long blindStructureId;
 
+    @NotNull(message = "奖励内容不能为空")
     private List<ItemsPrizeDto> itemsPrizeList;
 
     private String competitionIcon;

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/MessagesMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="receiverType != null">receiver_type = #{receiverType},</if>
         <if test="receiverIds != null">receiver_ids = #{receiverIds},</if>
         <if test="messageType != null">message_type = #{messageType},</if>
-        <if test="status != null">status = #{status},</if>
+        <if test="status != null">status = #{status}</if>
         WHERE id = #{id}
     </update>