Sfoglia il codice sorgente

feat(system): 添加起始盲注等级和真实姓名字段

- 在 Tournaments 和 TournamentsTemplate 实体中新增 startBlindLevel 字段
- 更新 DTO、BO 和 VO 类以支持新的 startBlindLevel 属性
- 修改 MyBatis 映射文件,增加对 startBlindLevel 的查询和插入支持
- 在 User 实体及映射文件中添加 realName 字段及相关配置
fugui001 2 settimane fa
parent
commit
acf503bab3

+ 2 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/Tournaments.java

@@ -66,6 +66,8 @@ public class Tournaments extends BaseEntity {
      */
     private Long lateRegistrationLevel;
 
+    private Long startBlindLevel;
+
     /**
      * 最大参赛人数
      */

+ 3 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/TournamentsTemplate.java

@@ -66,6 +66,9 @@ public class TournamentsTemplate extends BaseEntity {
      */
     private Long lateRegistrationLevel;
 
+
+    private Long startBlindLevel;
+
     /**
      * 最大参赛人数
      */

+ 3 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/User.java

@@ -33,6 +33,9 @@ public class User extends BaseEntity {
      */
     private String loginName;
 
+    private  String realName;
+
+
     /**
      * 登录密码
      */

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/TournamentsBo.java

@@ -41,6 +41,7 @@ public class TournamentsBo extends BaseEntity {
     @NotNull(message = "比赛开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String startTime;
 
+
     /**
      * 比赛结束时间
      */

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

@@ -30,6 +30,11 @@ public class TournamentsDto {
     @NotNull(message = "报名截止等级不能为空")
     private Long lateRegistrationLevel;
 
+    @NotNull(message = "起始等级不能为空")
+    private Long startBlindLevel;
+
+
+
     private Long maxPlayers;
     private Long status;
 

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/TournamentsVo.java

@@ -106,7 +106,7 @@ public class TournamentsVo implements Serializable {
     @ExcelProperty(value = "盲注表")
     private String blindStructuresName;
 
-
+    private Long startBlindLevel;
 
     @ExcelProperty(value = "奖励")
     public String prizeDisplay;

+ 0 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/UserVo.java

@@ -207,6 +207,4 @@ public class UserVo implements Serializable {
 
 
 
-
-
 }

+ 5 - 3
ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/TournamentsMapper.xml

@@ -10,11 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectTournamentsVoList" resultType="org.dromara.business.domain.vo.TournamentsVo">
-        SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,robot_count,is_delete,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type FROM tournaments  ${ew.customSqlSegment}
+        SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,robot_count,is_delete,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type,start_blind_level FROM tournaments  ${ew.customSqlSegment}
     </select>
 
     <select id="selectVoByIdInfo" resultType="org.dromara.business.domain.vo.TournamentsVo">
-       SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,robot_count,is_delete,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type FROM tournaments WHERE id =  #{id}
+       SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,robot_count,is_delete,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type,start_blind_level FROM tournaments WHERE id =  #{id}
     </select>
 
 
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gameVariant != null">game_variant = #{gameVariant},</if>
             <if test="targetTournamentId != null">target_tournament_id = #{targetTournamentId},</if>
             <if test="qualifierType != null">qualifier_type = #{qualifierType},</if>
+            <if test="startBlindLevel != null">start_blind_level = #{startBlindLevel},</if>
             <if test="qualifierValue != null">qualifier_value = #{qualifierValue}</if>
          </set>
         WHERE id = #{id}
@@ -79,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetTournamentId != null">target_tournament_id,</if>
             <if test="qualifierType != null">qualifier_type,</if>
             <if test="qualifierValue != null">qualifier_value,</if>
-
+            <if test="startBlindLevel != null">start_blind_level,</if>
 
         </trim>
         VALUES
@@ -109,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetTournamentId != null">#{targetTournamentId},</if>
             <if test="qualifierType != null">#{qualifierType},</if>
             <if test="qualifierValue != null">#{qualifierValue},</if>
+            <if test="startBlindLevel != null">#{startBlindLevel},</if>
         </trim>
     </insert>
 

+ 5 - 2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/TournamentsTemplateMapper.xml

@@ -10,11 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectTournamentsVoListTemplate" resultType="org.dromara.business.domain.vo.TournamentsVo">
-        SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,reward_players,total_signup,robot_count,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type FROM tournaments_template  ${ew.customSqlSegment}
+        SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,reward_players,total_signup,robot_count,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type,start_blind_level FROM tournaments_template  ${ew.customSqlSegment}
     </select>
 
     <select id="selectVoByIdInfoTemplate" resultType="org.dromara.business.domain.vo.TournamentsVo">
-       SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,reward_players,total_signup,robot_count,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type FROM tournaments_template WHERE id =  #{id}
+       SELECT id, name, start_time, end_time,game_type, starting_chips, level_duration, late_registration_level, max_players, status, created_at, updated_at,sign_time,competition_icon,tournaments_bi_id,reward_players,total_signup,robot_count,delay_card_time,delay_card_num,action_time,competition_bg,min_players,game_variant,target_tournament_id,qualifier_value,qualifier_type,start_blind_level FROM tournaments_template WHERE id =  #{id}
     </select>
 
 
@@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gameVariant != null">game_variant = #{gameVariant},</if>
             <if test="targetTournamentId != null">target_tournament_id = #{targetTournamentId},</if>
             <if test="qualifierType != null">qualifier_type = #{qualifierType},</if>
+            <if test="startBlindLevel != null">start_blind_level = #{startBlindLevel},</if>
             <if test="qualifierValue != null">qualifier_value = #{qualifierValue}</if>
         </set>
         WHERE id = #{id}
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetTournamentId != null">target_tournament_id,</if>
             <if test="qualifierType != null">qualifier_type,</if>
             <if test="qualifierValue != null">qualifier_value,</if>
+            <if test="startBlindLevel != null">start_blind_level,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -103,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetTournamentId != null">#{targetTournamentId},</if>
             <if test="qualifierType != null">#{qualifierType},</if>
             <if test="qualifierValue != null">#{qualifierValue},</if>
+            <if test="startBlindLevel != null">#{startBlindLevel},</if>
         </trim>
     </insert>
 

+ 5 - 5
ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/UserMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN a.status = 1 THEN '启用'
         ELSE ''
         END AS statusText,
-
+        a.real_name,
         a.is_locked,
         a.last_login_time,
         a.last_login_ip,
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN a.status = 1 THEN '启用'
         ELSE ''
         END AS statusText,
-
+        a.real_name,
         a.is_locked,
         a.last_login_time,
         a.last_login_ip,
@@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN a.status = 1 THEN '启用'
                 ELSE ''
                 END AS statusText,
-
+            a.real_name,
             a.is_locked,
             a.last_login_time,
             a.last_login_ip,
@@ -261,7 +261,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.register_ip,
             a.register_device,
             a.status,
-
+            a.real_name,
             CASE
                 WHEN a.status = 0 THEN '禁用'
                 WHEN a.status = 1 THEN '启用'
@@ -302,7 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.register_ip,
             a.register_device,
             a.status,
-
+            a.real_name,
             CASE
             WHEN a.status = 0 THEN '禁用'
             WHEN a.status = 1 THEN '启用'