diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java index 48169c73..3adb055d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java @@ -26,7 +26,7 @@ public class CompeteProjectConfig implements Serializable { private Long videoEndTime; - private Byte restrict; + private Byte videoRestrict; private static final long serialVersionUID = 1L; @@ -118,12 +118,12 @@ public class CompeteProjectConfig implements Serializable { this.videoEndTime = videoEndTime; } - public Byte getRestrict() { - return restrict; + public Byte getVideoRestrict() { + return videoRestrict; } - public void setRestrict(Byte restrict) { - this.restrict = restrict; + public void setVideoRestrict(Byte videoRestrict) { + this.videoRestrict = videoRestrict; } @Override @@ -143,7 +143,7 @@ public class CompeteProjectConfig implements Serializable { sb.append(", recStatus=").append(recStatus); sb.append(", videoStartTime=").append(videoStartTime); sb.append(", videoEndTime=").append(videoEndTime); - sb.append(", restrict=").append(restrict); + sb.append(", videoRestrict=").append(videoRestrict); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java index 88ff98a4..f72a67af 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java @@ -765,63 +765,63 @@ public class CompeteProjectConfigExample { return (Criteria) this; } - public Criteria andRestrictIsNull() { - addCriterion("restrict is null"); + public Criteria andVideoRestrictIsNull() { + addCriterion("video_restrict is null"); return (Criteria) this; } - public Criteria andRestrictIsNotNull() { - addCriterion("restrict is not null"); + public Criteria andVideoRestrictIsNotNull() { + addCriterion("video_restrict is not null"); return (Criteria) this; } - public Criteria andRestrictEqualTo(Byte value) { - addCriterion("restrict =", value, "restrict"); + public Criteria andVideoRestrictEqualTo(Byte value) { + addCriterion("video_restrict =", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictNotEqualTo(Byte value) { - addCriterion("restrict <>", value, "restrict"); + public Criteria andVideoRestrictNotEqualTo(Byte value) { + addCriterion("video_restrict <>", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictGreaterThan(Byte value) { - addCriterion("restrict >", value, "restrict"); + public Criteria andVideoRestrictGreaterThan(Byte value) { + addCriterion("video_restrict >", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictGreaterThanOrEqualTo(Byte value) { - addCriterion("restrict >=", value, "restrict"); + public Criteria andVideoRestrictGreaterThanOrEqualTo(Byte value) { + addCriterion("video_restrict >=", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictLessThan(Byte value) { - addCriterion("restrict <", value, "restrict"); + public Criteria andVideoRestrictLessThan(Byte value) { + addCriterion("video_restrict <", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictLessThanOrEqualTo(Byte value) { - addCriterion("restrict <=", value, "restrict"); + public Criteria andVideoRestrictLessThanOrEqualTo(Byte value) { + addCriterion("video_restrict <=", value, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictIn(List values) { - addCriterion("restrict in", values, "restrict"); + public Criteria andVideoRestrictIn(List values) { + addCriterion("video_restrict in", values, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictNotIn(List values) { - addCriterion("restrict not in", values, "restrict"); + public Criteria andVideoRestrictNotIn(List values) { + addCriterion("video_restrict not in", values, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictBetween(Byte value1, Byte value2) { - addCriterion("restrict between", value1, value2, "restrict"); + public Criteria andVideoRestrictBetween(Byte value1, Byte value2) { + addCriterion("video_restrict between", value1, value2, "videoRestrict"); return (Criteria) this; } - public Criteria andRestrictNotBetween(Byte value1, Byte value2) { - addCriterion("restrict not between", value1, value2, "restrict"); + public Criteria andVideoRestrictNotBetween(Byte value1, Byte value2) { + addCriterion("video_restrict not between", value1, value2, "videoRestrict"); return (Criteria) this; } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index d4d6e19d..2b49f45c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -72,6 +72,7 @@ public class CompeteService implements ICompeteService { private CompeteProjectMapper competeProjectMapper; @Resource private CompeteProjectPlayerMapper competeProjectPlayerMapper; + @Resource private CompeteGroupMapper competeGroupMapper; @Resource diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml b/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml index 4e2ef4e2..2f69d15e 100644 --- a/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml @@ -13,7 +13,7 @@ - + @@ -75,7 +75,7 @@ id, project_id, project_duration, site_num, start_time, end_time, created_at, updated_at, - rec_status, video_start_time, video_end_time, restrict + rec_status, video_start_time, video_end_time, video_restrict