diff --git a/game/src/main/java/com/ccsens/game/api/ScreenController.java b/game/src/main/java/com/ccsens/game/api/ScreenController.java index c9513f83..044877e4 100644 --- a/game/src/main/java/com/ccsens/game/api/ScreenController.java +++ b/game/src/main/java/com/ccsens/game/api/ScreenController.java @@ -78,5 +78,15 @@ public class ScreenController { } + @Login + @ApiOperation(value = "自定义游戏时查询游戏配置信息excel", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/config", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getConfig(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("再玩一次:{}",params); + String url = screenService.getConfig(params); + return JsonResponse.newInstance().ok(url); + } } diff --git a/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java b/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java index 74579bff..5eaa4126 100644 --- a/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java +++ b/game/src/main/java/com/ccsens/game/bean/dto/ScreenDto.java @@ -57,5 +57,12 @@ public class ScreenDto { private Byte startStatus; } + @Data + @ApiModel("查看配置文件") + public static class GetConfig{ + @ApiModelProperty("任务id") + private Long taskId; + } + } diff --git a/game/src/main/java/com/ccsens/game/bean/po/GameRecord.java b/game/src/main/java/com/ccsens/game/bean/po/GameRecord.java index 6c7029ce..2959c266 100644 --- a/game/src/main/java/com/ccsens/game/bean/po/GameRecord.java +++ b/game/src/main/java/com/ccsens/game/bean/po/GameRecord.java @@ -28,6 +28,14 @@ public class GameRecord implements Serializable { private Byte recStatus; + private Byte group; + + private Integer duration; + + private Integer memberLimit; + + private Byte rankRule; + private static final long serialVersionUID = 1L; public Long getId() { @@ -126,6 +134,38 @@ public class GameRecord implements Serializable { this.recStatus = recStatus; } + public Byte getGroup() { + return group; + } + + public void setGroup(Byte group) { + this.group = group; + } + + public Integer getDuration() { + return duration; + } + + public void setDuration(Integer duration) { + this.duration = duration; + } + + public Integer getMemberLimit() { + return memberLimit; + } + + public void setMemberLimit(Integer memberLimit) { + this.memberLimit = memberLimit; + } + + public Byte getRankRule() { + return rankRule; + } + + public void setRankRule(Byte rankRule) { + this.rankRule = rankRule; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -144,6 +184,10 @@ public class GameRecord implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", group=").append(group); + sb.append(", duration=").append(duration); + sb.append(", memberLimit=").append(memberLimit); + sb.append(", rankRule=").append(rankRule); sb.append("]"); return sb.toString(); } diff --git a/game/src/main/java/com/ccsens/game/bean/po/GameRecordExample.java b/game/src/main/java/com/ccsens/game/bean/po/GameRecordExample.java index 59c7d207..2ebc4d6c 100644 --- a/game/src/main/java/com/ccsens/game/bean/po/GameRecordExample.java +++ b/game/src/main/java/com/ccsens/game/bean/po/GameRecordExample.java @@ -844,6 +844,246 @@ public class GameRecordExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andGroupIsNull() { + addCriterion("group is null"); + return (Criteria) this; + } + + public Criteria andGroupIsNotNull() { + addCriterion("group is not null"); + return (Criteria) this; + } + + public Criteria andGroupEqualTo(Byte value) { + addCriterion("group =", value, "group"); + return (Criteria) this; + } + + public Criteria andGroupNotEqualTo(Byte value) { + addCriterion("group <>", value, "group"); + return (Criteria) this; + } + + public Criteria andGroupGreaterThan(Byte value) { + addCriterion("group >", value, "group"); + return (Criteria) this; + } + + public Criteria andGroupGreaterThanOrEqualTo(Byte value) { + addCriterion("group >=", value, "group"); + return (Criteria) this; + } + + public Criteria andGroupLessThan(Byte value) { + addCriterion("group <", value, "group"); + return (Criteria) this; + } + + public Criteria andGroupLessThanOrEqualTo(Byte value) { + addCriterion("group <=", value, "group"); + return (Criteria) this; + } + + public Criteria andGroupIn(List values) { + addCriterion("group in", values, "group"); + return (Criteria) this; + } + + public Criteria andGroupNotIn(List values) { + addCriterion("group not in", values, "group"); + return (Criteria) this; + } + + public Criteria andGroupBetween(Byte value1, Byte value2) { + addCriterion("group between", value1, value2, "group"); + return (Criteria) this; + } + + public Criteria andGroupNotBetween(Byte value1, Byte value2) { + addCriterion("group not between", value1, value2, "group"); + return (Criteria) this; + } + + public Criteria andDurationIsNull() { + addCriterion("duration is null"); + return (Criteria) this; + } + + public Criteria andDurationIsNotNull() { + addCriterion("duration is not null"); + return (Criteria) this; + } + + public Criteria andDurationEqualTo(Integer value) { + addCriterion("duration =", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotEqualTo(Integer value) { + addCriterion("duration <>", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationGreaterThan(Integer value) { + addCriterion("duration >", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationGreaterThanOrEqualTo(Integer value) { + addCriterion("duration >=", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationLessThan(Integer value) { + addCriterion("duration <", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationLessThanOrEqualTo(Integer value) { + addCriterion("duration <=", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationIn(List values) { + addCriterion("duration in", values, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotIn(List values) { + addCriterion("duration not in", values, "duration"); + return (Criteria) this; + } + + public Criteria andDurationBetween(Integer value1, Integer value2) { + addCriterion("duration between", value1, value2, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotBetween(Integer value1, Integer value2) { + addCriterion("duration not between", value1, value2, "duration"); + return (Criteria) this; + } + + public Criteria andMemberLimitIsNull() { + addCriterion("member_limit is null"); + return (Criteria) this; + } + + public Criteria andMemberLimitIsNotNull() { + addCriterion("member_limit is not null"); + return (Criteria) this; + } + + public Criteria andMemberLimitEqualTo(Integer value) { + addCriterion("member_limit =", value, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitNotEqualTo(Integer value) { + addCriterion("member_limit <>", value, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitGreaterThan(Integer value) { + addCriterion("member_limit >", value, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitGreaterThanOrEqualTo(Integer value) { + addCriterion("member_limit >=", value, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitLessThan(Integer value) { + addCriterion("member_limit <", value, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitLessThanOrEqualTo(Integer value) { + addCriterion("member_limit <=", value, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitIn(List values) { + addCriterion("member_limit in", values, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitNotIn(List values) { + addCriterion("member_limit not in", values, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitBetween(Integer value1, Integer value2) { + addCriterion("member_limit between", value1, value2, "memberLimit"); + return (Criteria) this; + } + + public Criteria andMemberLimitNotBetween(Integer value1, Integer value2) { + addCriterion("member_limit not between", value1, value2, "memberLimit"); + return (Criteria) this; + } + + public Criteria andRankRuleIsNull() { + addCriterion("rank_rule is null"); + return (Criteria) this; + } + + public Criteria andRankRuleIsNotNull() { + addCriterion("rank_rule is not null"); + return (Criteria) this; + } + + public Criteria andRankRuleEqualTo(Byte value) { + addCriterion("rank_rule =", value, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleNotEqualTo(Byte value) { + addCriterion("rank_rule <>", value, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleGreaterThan(Byte value) { + addCriterion("rank_rule >", value, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleGreaterThanOrEqualTo(Byte value) { + addCriterion("rank_rule >=", value, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleLessThan(Byte value) { + addCriterion("rank_rule <", value, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleLessThanOrEqualTo(Byte value) { + addCriterion("rank_rule <=", value, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleIn(List values) { + addCriterion("rank_rule in", values, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleNotIn(List values) { + addCriterion("rank_rule not in", values, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleBetween(Byte value1, Byte value2) { + addCriterion("rank_rule between", value1, value2, "rankRule"); + return (Criteria) this; + } + + public Criteria andRankRuleNotBetween(Byte value1, Byte value2) { + addCriterion("rank_rule not between", value1, value2, "rankRule"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/game/src/main/resources/mapper_raw/GameRecordMapper.xml b/game/src/main/resources/mapper_raw/GameRecordMapper.xml index 67ad2db8..101a20eb 100644 --- a/game/src/main/resources/mapper_raw/GameRecordMapper.xml +++ b/game/src/main/resources/mapper_raw/GameRecordMapper.xml @@ -14,6 +14,10 @@ + + + + @@ -75,7 +79,7 @@ id, user_pay_id, task_id, url, QR_code_url, time_difference, start_time, end_time, - game_status, created_at, updated_at, rec_status + game_status, created_at, updated_at, rec_status, group, duration, member_limit, rank_rule @@ -243,6 +273,18 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + group = #{record.group,jdbcType=TINYINT}, + + + duration = #{record.duration,jdbcType=INTEGER}, + + + member_limit = #{record.memberLimit,jdbcType=INTEGER}, + + + rank_rule = #{record.rankRule,jdbcType=TINYINT}, + @@ -261,7 +303,11 @@ game_status = #{record.gameStatus,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + group = #{record.group,jdbcType=TINYINT}, + duration = #{record.duration,jdbcType=INTEGER}, + member_limit = #{record.memberLimit,jdbcType=INTEGER}, + rank_rule = #{record.rankRule,jdbcType=TINYINT} @@ -302,6 +348,18 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + group = #{group,jdbcType=TINYINT}, + + + duration = #{duration,jdbcType=INTEGER}, + + + member_limit = #{memberLimit,jdbcType=INTEGER}, + + + rank_rule = #{rankRule,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -317,7 +375,11 @@ game_status = #{gameStatus,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + group = #{group,jdbcType=TINYINT}, + duration = #{duration,jdbcType=INTEGER}, + member_limit = #{memberLimit,jdbcType=INTEGER}, + rank_rule = #{rankRule,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/game/src/main/resources/mbg.xml b/game/src/main/resources/mbg.xml index bb23d3f1..5618ea6e 100644 --- a/game/src/main/resources/mbg.xml +++ b/game/src/main/resources/mbg.xml @@ -57,14 +57,14 @@ - +
-
+