diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java index f1cd9578..8764db28 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java @@ -8,7 +8,7 @@ public class CompeteProject implements Serializable { private String name; - private Long parendId; + private Long parentId; private Byte leve; @@ -48,12 +48,12 @@ public class CompeteProject implements Serializable { this.name = name == null ? null : name.trim(); } - public Long getParendId() { - return parendId; + public Long getParentId() { + return parentId; } - public void setParendId(Long parendId) { - this.parendId = parendId; + public void setParentId(Long parentId) { + this.parentId = parentId; } public Byte getLeve() { @@ -144,7 +144,7 @@ public class CompeteProject implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", name=").append(name); - sb.append(", parendId=").append(parendId); + sb.append(", parentId=").append(parentId); sb.append(", leve=").append(leve); sb.append(", team=").append(team); sb.append(", joinRule=").append(joinRule); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java index 0b1904a1..74e15499 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java @@ -235,63 +235,63 @@ public class CompeteProjectExample { return (Criteria) this; } - public Criteria andParendIdIsNull() { - addCriterion("parend_id is null"); + public Criteria andParentIdIsNull() { + addCriterion("parent_id is null"); return (Criteria) this; } - public Criteria andParendIdIsNotNull() { - addCriterion("parend_id is not null"); + public Criteria andParentIdIsNotNull() { + addCriterion("parent_id is not null"); return (Criteria) this; } - public Criteria andParendIdEqualTo(Long value) { - addCriterion("parend_id =", value, "parendId"); + public Criteria andParentIdEqualTo(Long value) { + addCriterion("parent_id =", value, "parentId"); return (Criteria) this; } - public Criteria andParendIdNotEqualTo(Long value) { - addCriterion("parend_id <>", value, "parendId"); + public Criteria andParentIdNotEqualTo(Long value) { + addCriterion("parent_id <>", value, "parentId"); return (Criteria) this; } - public Criteria andParendIdGreaterThan(Long value) { - addCriterion("parend_id >", value, "parendId"); + public Criteria andParentIdGreaterThan(Long value) { + addCriterion("parent_id >", value, "parentId"); return (Criteria) this; } - public Criteria andParendIdGreaterThanOrEqualTo(Long value) { - addCriterion("parend_id >=", value, "parendId"); + public Criteria andParentIdGreaterThanOrEqualTo(Long value) { + addCriterion("parent_id >=", value, "parentId"); return (Criteria) this; } - public Criteria andParendIdLessThan(Long value) { - addCriterion("parend_id <", value, "parendId"); + public Criteria andParentIdLessThan(Long value) { + addCriterion("parent_id <", value, "parentId"); return (Criteria) this; } - public Criteria andParendIdLessThanOrEqualTo(Long value) { - addCriterion("parend_id <=", value, "parendId"); + public Criteria andParentIdLessThanOrEqualTo(Long value) { + addCriterion("parent_id <=", value, "parentId"); return (Criteria) this; } - public Criteria andParendIdIn(List values) { - addCriterion("parend_id in", values, "parendId"); + public Criteria andParentIdIn(List values) { + addCriterion("parent_id in", values, "parentId"); return (Criteria) this; } - public Criteria andParendIdNotIn(List values) { - addCriterion("parend_id not in", values, "parendId"); + public Criteria andParentIdNotIn(List values) { + addCriterion("parent_id not in", values, "parentId"); return (Criteria) this; } - public Criteria andParendIdBetween(Long value1, Long value2) { - addCriterion("parend_id between", value1, value2, "parendId"); + public Criteria andParentIdBetween(Long value1, Long value2) { + addCriterion("parent_id between", value1, value2, "parentId"); return (Criteria) this; } - public Criteria andParendIdNotBetween(Long value1, Long value2) { - addCriterion("parend_id not between", value1, value2, "parendId"); + public Criteria andParentIdNotBetween(Long value1, Long value2) { + addCriterion("parent_id not between", value1, value2, "parentId"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayer.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayer.java index e055aa72..e62d764d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayer.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayer.java @@ -8,7 +8,7 @@ public class CompeteProjectPlayer implements Serializable { private Long playerId; - private Long porjectId; + private Long projectId; private Long competeTimeId; @@ -40,12 +40,12 @@ public class CompeteProjectPlayer implements Serializable { this.playerId = playerId; } - public Long getPorjectId() { - return porjectId; + public Long getProjectId() { + return projectId; } - public void setPorjectId(Long porjectId) { - this.porjectId = porjectId; + public void setProjectId(Long projectId) { + this.projectId = projectId; } public Long getCompeteTimeId() { @@ -104,7 +104,7 @@ public class CompeteProjectPlayer implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", playerId=").append(playerId); - sb.append(", porjectId=").append(porjectId); + sb.append(", projectId=").append(projectId); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", genderGroup=").append(genderGroup); sb.append(", certificate=").append(certificate); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayerExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayerExample.java index 25542cec..8ab4278d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayerExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectPlayerExample.java @@ -225,63 +225,63 @@ public class CompeteProjectPlayerExample { return (Criteria) this; } - public Criteria andPorjectIdIsNull() { - addCriterion("porject_id is null"); + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); return (Criteria) this; } - public Criteria andPorjectIdIsNotNull() { - addCriterion("porject_id is not null"); + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); return (Criteria) this; } - public Criteria andPorjectIdEqualTo(Long value) { - addCriterion("porject_id =", value, "porjectId"); + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdNotEqualTo(Long value) { - addCriterion("porject_id <>", value, "porjectId"); + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdGreaterThan(Long value) { - addCriterion("porject_id >", value, "porjectId"); + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("porject_id >=", value, "porjectId"); + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdLessThan(Long value) { - addCriterion("porject_id <", value, "porjectId"); + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdLessThanOrEqualTo(Long value) { - addCriterion("porject_id <=", value, "porjectId"); + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdIn(List values) { - addCriterion("porject_id in", values, "porjectId"); + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdNotIn(List values) { - addCriterion("porject_id not in", values, "porjectId"); + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdBetween(Long value1, Long value2) { - addCriterion("porject_id between", value1, value2, "porjectId"); + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdNotBetween(Long value1, Long value2) { - addCriterion("porject_id not between", value1, value2, "porjectId"); + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java index 60d0c226..0bb0aeab 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeam.java @@ -8,7 +8,7 @@ public class CompeteTeam implements Serializable { private Long creator; - private Long porjectId; + private Long projectId; private Long competeTimeId; @@ -42,12 +42,12 @@ public class CompeteTeam implements Serializable { this.creator = creator; } - public Long getPorjectId() { - return porjectId; + public Long getProjectId() { + return projectId; } - public void setPorjectId(Long porjectId) { - this.porjectId = porjectId; + public void setProjectId(Long projectId) { + this.projectId = projectId; } public Long getCompeteTimeId() { @@ -114,7 +114,7 @@ public class CompeteTeam implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", creator=").append(creator); - sb.append(", porjectId=").append(porjectId); + sb.append(", projectId=").append(projectId); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", genderGroup=").append(genderGroup); sb.append(", certificate=").append(certificate); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java index f3e8b615..8e894f31 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamExample.java @@ -225,63 +225,63 @@ public class CompeteTeamExample { return (Criteria) this; } - public Criteria andPorjectIdIsNull() { - addCriterion("porject_id is null"); + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); return (Criteria) this; } - public Criteria andPorjectIdIsNotNull() { - addCriterion("porject_id is not null"); + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); return (Criteria) this; } - public Criteria andPorjectIdEqualTo(Long value) { - addCriterion("porject_id =", value, "porjectId"); + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdNotEqualTo(Long value) { - addCriterion("porject_id <>", value, "porjectId"); + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdGreaterThan(Long value) { - addCriterion("porject_id >", value, "porjectId"); + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("porject_id >=", value, "porjectId"); + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdLessThan(Long value) { - addCriterion("porject_id <", value, "porjectId"); + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdLessThanOrEqualTo(Long value) { - addCriterion("porject_id <=", value, "porjectId"); + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdIn(List values) { - addCriterion("porject_id in", values, "porjectId"); + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdNotIn(List values) { - addCriterion("porject_id not in", values, "porjectId"); + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdBetween(Long value1, Long value2) { - addCriterion("porject_id between", value1, value2, "porjectId"); + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); return (Criteria) this; } - public Criteria andPorjectIdNotBetween(Long value1, Long value2) { - addCriterion("porject_id not between", value1, value2, "porjectId"); + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); 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 f7caeede..0cb8d8f4 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -13,6 +13,7 @@ import com.ccsens.util.bean.dto.QueryDto; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -50,22 +51,21 @@ public class CompeteService implements ICompeteService{ */ @Override public List queryCompeteCompany(QueryDto params) { -// CompeteDto.CompeteTypeAndKey competeTypeAndKey = params.getParam(); -// String key = competeTypeAndKey.getType() + Constant.Redis.COMPETE_COMPANY; -// Object list = redisUtil.lGet(key,0,-1); -// List competeCompanyList = (List) list; -// List companyList = new ArrayList<>(); -// System.out.println(competeCompanyList); -// competeCompanyList.forEach(competeCompany -> { -// if(competeCompany.getName().contains(competeTypeAndKey.getKey())){ -// CompeteVo.CompeteCompany company = new CompeteVo.CompeteCompany(); -// company.setGroupId(competeCompany.getId()); -// company.setGroupName(competeCompany.getName()); -// companyList.add(company); -// } -// }); -// return companyList; - return null; + CompeteDto.CompeteTypeAndKey competeTypeAndKey = params.getParam(); + String key = competeTypeAndKey.getType() + Constant.Redis.COMPETE_COMPANY; + Object list = redisUtil.lGet(key,0,-1); + List competeCompanyList = (List) list; + List companyList = new ArrayList<>(); + System.out.println(competeCompanyList); + competeCompanyList.forEach(competeCompany -> { + if(competeCompany.getName().contains(competeTypeAndKey.getKey())){ + CompeteVo.CompeteCompany company = new CompeteVo.CompeteCompany(); + company.setGroupId(competeCompany.getId()); + company.setGroupName(competeCompany.getName()); + companyList.add(company); + } + }); + return companyList; } /** diff --git a/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml b/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml index 07155793..bb8e67e8 100644 --- a/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteProjectMapper.xml @@ -4,7 +4,7 @@ - + @@ -75,7 +75,7 @@ - id, name, parend_id, leve, team, join_rule, certificate, member_min, member_max, + id, name, parent_id, leve, team, join_rule, certificate, member_min, member_max, type, created_at, updated_at, rec_status @@ -105,11 +105,11 @@ - insert into t_compete_project_player (id, player_id, porject_id, + insert into t_compete_project_player (id, player_id, project_id, compete_time_id, gender_group, certificate, created_at, updated_at, rec_status ) - values (#{id,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{porjectId,jdbcType=BIGINT}, + values (#{id,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{genderGroup,jdbcType=TINYINT}, #{certificate,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} ) @@ -123,8 +123,8 @@ player_id, - - porject_id, + + project_id, compete_time_id, @@ -152,8 +152,8 @@ #{playerId,jdbcType=BIGINT}, - - #{porjectId,jdbcType=BIGINT}, + + #{projectId,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, @@ -190,8 +190,8 @@ player_id = #{record.playerId,jdbcType=BIGINT}, - - porject_id = #{record.porjectId,jdbcType=BIGINT}, + + project_id = #{record.projectId,jdbcType=BIGINT}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -220,7 +220,7 @@ update t_compete_project_player set id = #{record.id,jdbcType=BIGINT}, player_id = #{record.playerId,jdbcType=BIGINT}, - porject_id = #{record.porjectId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, gender_group = #{record.genderGroup,jdbcType=TINYINT}, certificate = #{record.certificate,jdbcType=TINYINT}, @@ -237,8 +237,8 @@ player_id = #{playerId,jdbcType=BIGINT}, - - porject_id = #{porjectId,jdbcType=BIGINT}, + + project_id = #{projectId,jdbcType=BIGINT}, compete_time_id = #{competeTimeId,jdbcType=BIGINT}, @@ -264,7 +264,7 @@ update t_compete_project_player set player_id = #{playerId,jdbcType=BIGINT}, - porject_id = #{porjectId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, compete_time_id = #{competeTimeId,jdbcType=BIGINT}, gender_group = #{genderGroup,jdbcType=TINYINT}, certificate = #{certificate,jdbcType=TINYINT}, diff --git a/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml b/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml index d0b66882..cdd11c38 100644 --- a/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteTeamMapper.xml @@ -4,7 +4,7 @@ - + @@ -72,7 +72,7 @@ - id, creator, porject_id, compete_time_id, gender_group, certificate, qr_code, created_at, + id, creator, project_id, compete_time_id, gender_group, certificate, qr_code, created_at, updated_at, rec_status