Jelajahi Sumber

feat(tournaments): 添加赛事晋级和游戏玩法相关字段- 在 Tournaments 实体类中新增目标赛事ID、晋级条件类型、晋级条件值和游戏玩法类型字段
- 在 TournamentsDto 数据传输对象中同步新增上述字段- 更新 TournamentsMapper.xml 文件,为查询、更新和插入操作添加新字段映射
- 在 TournamentsTemplate 实体类中新增相同字段以支持模板功能
- 更新 TournamentsTemplateMapper.xml 文件,为模板相关的SQL操作添加新字段支持
- 在 TournamentsVo 视图对象中添加对应字段以便前端展示相关信息

fugui001 1 bulan lalu
induk
melakukan
adc4d62263

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

@@ -127,4 +127,24 @@ public class Tournaments extends BaseEntity {
      */
     private Integer minPlayers;
 
+    /**
+     * 目标赛事ID
+     */
+    private Long targetTournamentId;
+
+    /**
+     * 晋级条件类型:0=无晋级,1=按级别晋级,2=按人数比例晋级
+     */
+    private  Integer qualifierType;
+
+    /**
+     * 晋级条件值:级别数或人数比例(1-100)
+     */
+    private  Integer qualifierValue;
+
+    /**
+     * 游戏玩法类型:0=德州扑克, 1=奥马哈, 2=短牌
+     */
+    private Integer gameVariant;
+
 }

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

@@ -121,4 +121,24 @@ public class TournamentsTemplate extends BaseEntity {
 
     private Integer minPlayers;
 
+    /**
+     * 游戏玩法类型:0=德州扑克, 1=奥马哈, 2=短牌
+     */
+    private Integer gameVariant;
+
+    /**
+     * 目标赛事ID
+     */
+    private Long targetTournamentId;
+
+    /**
+     * 晋级条件类型:0=无晋级,1=按级别晋级,2=按人数比例晋级
+     */
+    private  Integer qualifierType;
+
+    /**
+     * 晋级条件值:级别数或人数比例(1-100)
+     */
+    private  Integer qualifierValue;
+
 }

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

@@ -83,4 +83,25 @@ public class TournamentsDto {
      */
     private Integer minPlayers;
 
+    /**
+     * 游戏玩法类型:0=德州扑克, 1=奥马哈, 2=短牌
+     */
+    private Integer gameVariant;
+
+    /**
+     * 目标赛事ID
+     */
+    private Long targetTournamentId;
+
+    /**
+     * 晋级条件类型:0=无晋级,1=按级别晋级,2=按人数比例晋级
+     */
+    private  Integer qualifierType;
+
+    /**
+     * 晋级条件值:级别数或人数比例(1-100)
+     */
+    private  Integer qualifierValue;
+
+
 }

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

@@ -275,4 +275,24 @@ public class TournamentsVo implements Serializable {
      */
     private Integer minPlayers;
 
+    /**
+     * 目标赛事ID
+     */
+    private Long targetTournamentId;
+
+    /**
+     * 晋级条件类型:0=无晋级,1=按级别晋级,2=按人数比例晋级
+     */
+    private  Integer qualifierType;
+
+    /**
+     * 晋级条件值:级别数或人数比例(1-100)
+     */
+    private  Integer qualifierValue;
+
+    /**
+     * 游戏玩法类型:0=德州扑克, 1=奥马哈, 2=短牌
+     */
+    private Integer gameVariant;
+
 }

+ 20 - 4
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 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 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 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 FROM tournaments WHERE id =  #{id}
     </select>
 
 
@@ -41,8 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionTime != null">action_time = #{actionTime},</if>
             <if test="robotCount != null">robot_count = #{robotCount},</if>
             <if test="competitionBg != null">competition_bg = #{competitionBg},</if>
-            <if test="minPlayers != null">min_players = #{minPlayers}</if>
-        </set>
+            <if test="minPlayers != null">min_players = #{minPlayers},</if>
+            <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="qualifierValue != null">qualifier_value = #{qualifierValue}</if>
+         </set>
         WHERE id = #{id}
     </update>
 
@@ -70,6 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionTime != null">action_time,</if>
             <if test="competitionBg != null">competition_bg,</if>
             <if test="minPlayers != null">min_players,</if>
+
+            <if test="gameVariant != null">game_variant,</if>
+            <if test="targetTournamentId != null">target_tournament_id,</if>
+            <if test="qualifierType != null">qualifier_type,</if>
+            <if test="qualifierValue != null">qualifier_value,</if>
+
+
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -93,6 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionTime != null">#{actionTime},</if>
             <if test="competitionBg != null">#{competitionBg},</if>
             <if test="minPlayers != null">#{minPlayers},</if>
+
+            <if test="gameVariant != null">#{gameVariant},</if>
+            <if test="targetTournamentId != null">#{targetTournamentId},</if>
+            <if test="qualifierType != null">#{qualifierType},</if>
+            <if test="qualifierValue != null">#{qualifierValue},</if>
         </trim>
     </insert>
 

+ 16 - 4
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 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 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 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 FROM tournaments_template WHERE id =  #{id}
     </select>
 
 
@@ -40,8 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delayCardNum != null">delay_card_num = #{delayCardNum},</if>
             <if test="actionTime != null">action_time = #{actionTime},</if>
             <if test="robotCount != null">robot_count = #{robotCount},</if>
-            <if test="competitionBg != null">competition_bg = #{competitionBg}</if>
-            <if test="minPlayers != null">min_players = #{minPlayers}</if>
+            <if test="competitionBg != null">competition_bg = #{competitionBg},</if>
+            <if test="minPlayers != null">min_players = #{minPlayers},</if>
+            <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="qualifierValue != null">qualifier_value = #{qualifierValue}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -69,6 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionTime != null">action_time,</if>
             <if test="competitionBg != null">competition_bg,</if>
             <if test="minPlayers != null">min_players,</if>
+            <if test="gameVariant != null">game_variant,</if>
+            <if test="targetTournamentId != null">target_tournament_id,</if>
+            <if test="qualifierType != null">qualifier_type,</if>
+            <if test="qualifierValue != null">qualifier_value,</if>
         </trim>
         VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -91,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="actionTime != null">#{actionTime},</if>
             <if test="competitionBg != null">#{competitionBg},</if>
             <if test="minPlayers != null">#{minPlayers},</if>
+            <if test="gameVariant != null">#{gameVariant},</if>
+            <if test="targetTournamentId != null">#{targetTournamentId},</if>
+            <if test="qualifierType != null">#{qualifierType},</if>
+            <if test="qualifierValue != null">#{qualifierValue},</if>
         </trim>
     </insert>