From 47d363e91a2e17709836644c718286f8ce0cd2d9 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 3 Sep 2020 10:47:37 +0800 Subject: [PATCH] =?UTF-8?q?20200903=5F=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=86=99?= =?UTF-8?q?=E9=94=99=E7=9A=84=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/bean/po/CompeteTeam.java | 12 ++--- .../ccsens/mt/bean/po/CompeteTeamExample.java | 48 +++++++++---------- .../com/ccsens/mt/service/CompeteService.java | 17 ++++++- .../java/com/ccsens/mt/util/Constant.java | 5 +- .../mapper_raw/CompeteTeamMapper.xml | 28 +++++------ 5 files changed, 64 insertions(+), 46 deletions(-) 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 6f3735cc..0bd29acc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1,8 +1,12 @@ package com.ccsens.mt.service; +import cn.hutool.core.collection.CollectionUtil; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.po.CompeteCompany; +import com.ccsens.mt.bean.po.CompeteCompanyExample; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; import com.ccsens.util.bean.dto.QueryDto; import org.springframework.stereotype.Service; @@ -16,6 +20,8 @@ import java.util.List; public class CompeteService implements ICompeteService{ @Resource private CompeteTimeDao competeTimeDao; + @Resource + private CompeteCompanyMapper competeCompanyMapper; /** * 查看第几届 @@ -49,8 +55,17 @@ public class CompeteService implements ICompeteService{ */ @Override public void syncCompeteCompany(QueryDto params) { + CompeteDto.CompeteType competeType = params.getParam(); //根据type查找数据库内所有参赛单位 - //将单位信息存入redis + CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample(); + competeCompanyExample.createCriteria().andTypeEqualTo((byte) competeType.getType()); + List competeCompanyList = competeCompanyMapper.selectByExample(competeCompanyExample); + if(CollectionUtil.isNotEmpty(competeCompanyList)){ + competeCompanyList.forEach(competeCompany -> { + //将单位信息存入redis +// String companyKey = Constant. + }); + } } /** diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java index fdfec6bd..66f33449 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -23,7 +23,10 @@ public class Constant { public final static int VOTE_COMPLETED = 2; //投票已结束 public final static int VOTE_START = 1; - + // 远程比赛参赛单位 + public final static String COMPETE_COMPANY = "_compete_company_"; + // 远程比赛参赛单位存在时间10天 + public final static long COMPETE_COMPANY_TIME = 10 * 24 * 60 * 60; } public static final int VOTE_TOTAL = 2; 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