From d5728814aa1b4ea3b53a169daedd0c9d497e7c5d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 12 Nov 2020 20:37:14 +0800 Subject: [PATCH] =?UTF-8?q?20201112=E4=BF=AE=E6=94=B9=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E9=80=9A=E7=BA=A7=E8=B5=9B=E6=8A=A5=E5=90=8D=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteTaskController.java | 34 +- .../mt/bean/dto/ProvinceCompeteDto.java | 16 + .../ccsens/mt/bean/po/CompeteJudgment.java | 117 +++ .../mt/bean/po/CompeteJudgmentExample.java | 741 ++++++++++++++++ .../ccsens/mt/bean/po/CompeteStartOrder.java | 22 + .../mt/bean/po/CompeteStartOrderExample.java | 120 +++ .../mt/bean/po/CompeteVarietyScore.java | 128 +++ .../bean/po/CompeteVarietyScoreExample.java | 811 ++++++++++++++++++ .../java/com/ccsens/mt/bean/vo/TableVo.java | 24 +- .../mt/persist/dao/CompeteCompanyDao.java | 8 + .../persist/mapper/CompeteJudgmentMapper.java | 30 + .../mapper/CompeteVarietyScoreMapper.java | 30 + .../ccsens/mt/service/CompeteTaskService.java | 68 ++ .../mt/service/ICompeteTaskService.java | 18 + .../ccsens/mt/service/ProvinceService.java | 67 +- .../com/ccsens/mt/service/VideoService.java | 92 +- .../java/com/ccsens/mt/util/Constant.java | 12 + mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteCompanyDao.xml | 12 + .../mapper_raw/CompeteJudgmentMapper.xml | 276 ++++++ .../mapper_raw/CompeteStartOrderMapper.xml | 48 +- .../mapper_raw/CompeteVarietyScoreMapper.xml | 291 +++++++ .../main/java/com/ccsens/util/CodeEnum.java | 8 + 23 files changed, 2881 insertions(+), 96 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java create mode 100644 mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java create mode 100644 mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java create mode 100644 mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml create mode 100644 mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index c89c3775..f784d310 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -1,13 +1,43 @@ package com.ccsens.mt.api; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.TableVo; +import com.ccsens.mt.service.ICompeteTaskService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "日程", description = "") +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 逗 + */ +@Api(tags = "比赛日程相关接口", description = "裁判分配日程安排等。。。") @RestController -@RequestMapping("/task") +@RequestMapping("/compete/task") @Slf4j public class CompeteTaskController { + @Resource + private ICompeteTaskService competeTaskService; + + @MustLogin + @ApiOperation(value = "日程安排更新", notes = "") + @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto> params) { + log.info("日程安排更新：{}",params); + List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam()); + log.info("日程安排更新：{}",dailyScheduleProcessList); + return JsonResponse.newInstance().ok(dailyScheduleProcessList); + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index b40721cd..3f0d6e54 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -198,4 +198,20 @@ public class ProvinceCompeteDto { @ApiModelProperty("队伍id") private Long teamId; } + + @Data + @ApiModel("修改日程安排") + public static class UpdateCompeteTask{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("单项时间 单位：秒") + private Long duration; + @ApiModelProperty("场地数量") + private int siteNum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java new file mode 100644 index 00000000..c2de5e32 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -0,0 +1,117 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteJudgment implements Serializable { + private Long id; + + private Long competeTimeId; + + private Long siteOrderId; + + private Long projectId; + + private Long userId; + + private Byte chiefJudgment; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompeteTimeId() { + return competeTimeId; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + + public Long getSiteOrderId() { + return siteOrderId; + } + + public void setSiteOrderId(Long siteOrderId) { + this.siteOrderId = siteOrderId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Byte getChiefJudgment() { + return chiefJudgment; + } + + public void setChiefJudgment(Byte chiefJudgment) { + this.chiefJudgment = chiefJudgment; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", competeTimeId=").append(competeTimeId); + sb.append(", siteOrderId=").append(siteOrderId); + sb.append(", projectId=").append(projectId); + sb.append(", userId=").append(userId); + sb.append(", chiefJudgment=").append(chiefJudgment); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java new file mode 100644 index 00000000..4d75f9ed --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -0,0 +1,741 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteJudgmentExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteJudgmentExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNull() { + addCriterion("compete_time_id is null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNotNull() { + addCriterion("compete_time_id is not null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdEqualTo(Long value) { + addCriterion("compete_time_id =", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotEqualTo(Long value) { + addCriterion("compete_time_id <>", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThan(Long value) { + addCriterion("compete_time_id >", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("compete_time_id >=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThan(Long value) { + addCriterion("compete_time_id <", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThanOrEqualTo(Long value) { + addCriterion("compete_time_id <=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIn(List values) { + addCriterion("compete_time_id in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotIn(List values) { + addCriterion("compete_time_id not in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdBetween(Long value1, Long value2) { + addCriterion("compete_time_id between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotBetween(Long value1, Long value2) { + addCriterion("compete_time_id not between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNull() { + addCriterion("site_order_id is null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNotNull() { + addCriterion("site_order_id is not null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdEqualTo(Long value) { + addCriterion("site_order_id =", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotEqualTo(Long value) { + addCriterion("site_order_id <>", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThan(Long value) { + addCriterion("site_order_id >", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("site_order_id >=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThan(Long value) { + addCriterion("site_order_id <", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) { + addCriterion("site_order_id <=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIn(List values) { + addCriterion("site_order_id in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotIn(List values) { + addCriterion("site_order_id not in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdBetween(Long value1, Long value2) { + addCriterion("site_order_id between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) { + addCriterion("site_order_id not between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentIsNull() { + addCriterion("chief_judgment is null"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentIsNotNull() { + addCriterion("chief_judgment is not null"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentEqualTo(Byte value) { + addCriterion("chief_judgment =", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentNotEqualTo(Byte value) { + addCriterion("chief_judgment <>", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentGreaterThan(Byte value) { + addCriterion("chief_judgment >", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentGreaterThanOrEqualTo(Byte value) { + addCriterion("chief_judgment >=", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentLessThan(Byte value) { + addCriterion("chief_judgment <", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentLessThanOrEqualTo(Byte value) { + addCriterion("chief_judgment <=", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentIn(List values) { + addCriterion("chief_judgment in", values, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentNotIn(List values) { + addCriterion("chief_judgment not in", values, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentBetween(Byte value1, Byte value2) { + addCriterion("chief_judgment between", value1, value2, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentNotBetween(Byte value1, Byte value2) { + addCriterion("chief_judgment not between", value1, value2, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java index 9e552008..eea9504c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -6,8 +6,12 @@ import java.util.Date; public class CompeteStartOrder implements Serializable { private Long id; + private Long projectId; + private Long playerId; + private Byte team; + private Byte competeOrder; private Byte site; @@ -28,6 +32,14 @@ public class CompeteStartOrder implements Serializable { this.id = id; } + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + public Long getPlayerId() { return playerId; } @@ -36,6 +48,14 @@ public class CompeteStartOrder implements Serializable { this.playerId = playerId; } + public Byte getTeam() { + return team; + } + + public void setTeam(Byte team) { + this.team = team; + } + public Byte getCompeteOrder() { return competeOrder; } @@ -83,7 +103,9 @@ public class CompeteStartOrder implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", projectId=").append(projectId); sb.append(", playerId=").append(playerId); + sb.append(", team=").append(team); sb.append(", competeOrder=").append(competeOrder); sb.append(", site=").append(site); sb.append(", createdAt=").append(createdAt); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java index 2f59cbc9..efd0d04e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java @@ -165,6 +165,66 @@ public class CompeteStartOrderExample { return (Criteria) this; } + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + public Criteria andPlayerIdIsNull() { addCriterion("player_id is null"); return (Criteria) this; @@ -225,6 +285,66 @@ public class CompeteStartOrderExample { return (Criteria) this; } + public Criteria andTeamIsNull() { + addCriterion("team is null"); + return (Criteria) this; + } + + public Criteria andTeamIsNotNull() { + addCriterion("team is not null"); + return (Criteria) this; + } + + public Criteria andTeamEqualTo(Byte value) { + addCriterion("team =", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamNotEqualTo(Byte value) { + addCriterion("team <>", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamGreaterThan(Byte value) { + addCriterion("team >", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamGreaterThanOrEqualTo(Byte value) { + addCriterion("team >=", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamLessThan(Byte value) { + addCriterion("team <", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamLessThanOrEqualTo(Byte value) { + addCriterion("team <=", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamIn(List values) { + addCriterion("team in", values, "team"); + return (Criteria) this; + } + + public Criteria andTeamNotIn(List values) { + addCriterion("team not in", values, "team"); + return (Criteria) this; + } + + public Criteria andTeamBetween(Byte value1, Byte value2) { + addCriterion("team between", value1, value2, "team"); + return (Criteria) this; + } + + public Criteria andTeamNotBetween(Byte value1, Byte value2) { + addCriterion("team not between", value1, value2, "team"); + return (Criteria) this; + } + public Criteria andCompeteOrderIsNull() { addCriterion("compete_order is null"); return (Criteria) this; diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java new file mode 100644 index 00000000..9fa53c5a --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java @@ -0,0 +1,128 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteVarietyScore implements Serializable { + private Long id; + + private Long competeTimeId; + + private Long projectId; + + private Long siteOrderId; + + private String code; + + private Integer score; + + private Long judgmentId; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompeteTimeId() { + return competeTimeId; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getSiteOrderId() { + return siteOrderId; + } + + public void setSiteOrderId(Long siteOrderId) { + this.siteOrderId = siteOrderId; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public Long getJudgmentId() { + return judgmentId; + } + + public void setJudgmentId(Long judgmentId) { + this.judgmentId = judgmentId; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", competeTimeId=").append(competeTimeId); + sb.append(", projectId=").append(projectId); + sb.append(", siteOrderId=").append(siteOrderId); + sb.append(", code=").append(code); + sb.append(", score=").append(score); + sb.append(", judgmentId=").append(judgmentId); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java new file mode 100644 index 00000000..05ddc769 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java @@ -0,0 +1,811 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteVarietyScoreExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteVarietyScoreExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNull() { + addCriterion("compete_time_id is null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNotNull() { + addCriterion("compete_time_id is not null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdEqualTo(Long value) { + addCriterion("compete_time_id =", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotEqualTo(Long value) { + addCriterion("compete_time_id <>", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThan(Long value) { + addCriterion("compete_time_id >", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("compete_time_id >=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThan(Long value) { + addCriterion("compete_time_id <", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThanOrEqualTo(Long value) { + addCriterion("compete_time_id <=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIn(List values) { + addCriterion("compete_time_id in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotIn(List values) { + addCriterion("compete_time_id not in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdBetween(Long value1, Long value2) { + addCriterion("compete_time_id between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotBetween(Long value1, Long value2) { + addCriterion("compete_time_id not between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNull() { + addCriterion("site_order_id is null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNotNull() { + addCriterion("site_order_id is not null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdEqualTo(Long value) { + addCriterion("site_order_id =", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotEqualTo(Long value) { + addCriterion("site_order_id <>", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThan(Long value) { + addCriterion("site_order_id >", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("site_order_id >=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThan(Long value) { + addCriterion("site_order_id <", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) { + addCriterion("site_order_id <=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIn(List values) { + addCriterion("site_order_id in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotIn(List values) { + addCriterion("site_order_id not in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdBetween(Long value1, Long value2) { + addCriterion("site_order_id between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) { + addCriterion("site_order_id not between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(Integer value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(Integer value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(Integer value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(Integer value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(Integer value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(Integer value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(Integer value1, Integer value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(Integer value1, Integer value2) { + addCriterion("score not between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andJudgmentIdIsNull() { + addCriterion("judgment_id is null"); + return (Criteria) this; + } + + public Criteria andJudgmentIdIsNotNull() { + addCriterion("judgment_id is not null"); + return (Criteria) this; + } + + public Criteria andJudgmentIdEqualTo(Long value) { + addCriterion("judgment_id =", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdNotEqualTo(Long value) { + addCriterion("judgment_id <>", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdGreaterThan(Long value) { + addCriterion("judgment_id >", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdGreaterThanOrEqualTo(Long value) { + addCriterion("judgment_id >=", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdLessThan(Long value) { + addCriterion("judgment_id <", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdLessThanOrEqualTo(Long value) { + addCriterion("judgment_id <=", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdIn(List values) { + addCriterion("judgment_id in", values, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdNotIn(List values) { + addCriterion("judgment_id not in", values, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdBetween(Long value1, Long value2) { + addCriterion("judgment_id between", value1, value2, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdNotBetween(Long value1, Long value2) { + addCriterion("judgment_id not between", value1, value2, "judgmentId"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 6e26d9fc..6892086a 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -122,7 +122,7 @@ public class TableVo { private String projectName; @ApiModelProperty("参赛人/队伍") private int joinNum; - @ApiModelProperty("单项时间") + @ApiModelProperty("单项时间 单位秒") private long singleTime; @ApiModelProperty("场地") private int siteNum; @@ -135,6 +135,28 @@ public class TableVo { @ApiModelProperty("项目结束时间") private Long endTime; } + @Data + @ApiModel("返回项目配置信息") + public static class CompeteProjectConfig{ + @ApiModelProperty("参赛id") + private Long projectId; + @ApiModelProperty("参赛项目") + private String projectName; + @ApiModelProperty("参赛人/队伍") + private int joinNum; + @ApiModelProperty("单项时间 单位秒") + private int duration; + @ApiModelProperty("场地") + private int siteNum; + @ApiModelProperty("场次") + private double games; + @ApiModelProperty("总时间") + private double timeSum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + } @Data diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index edd60d82..9c27abdd 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -144,4 +144,12 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { List selectProjectByType(Long id); List queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId); + + /** + * 查找选手参加的比赛id（不包含通级赛） + * @param playerId + * @param competeTimeId + * @return + */ + int selectJoinNumByPlayer(@Param("playerId")Long playerId, @Param("competeTimeId")Long competeTimeId); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java new file mode 100644 index 00000000..303883e8 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteJudgment; +import com.ccsens.mt.bean.po.CompeteJudgmentExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteJudgmentMapper { + long countByExample(CompeteJudgmentExample example); + + int deleteByExample(CompeteJudgmentExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteJudgment record); + + int insertSelective(CompeteJudgment record); + + List selectByExample(CompeteJudgmentExample example); + + CompeteJudgment selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteJudgment record, @Param("example") CompeteJudgmentExample example); + + int updateByExample(@Param("record") CompeteJudgment record, @Param("example") CompeteJudgmentExample example); + + int updateByPrimaryKeySelective(CompeteJudgment record); + + int updateByPrimaryKey(CompeteJudgment record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java new file mode 100644 index 00000000..14036ed9 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteVarietyScore; +import com.ccsens.mt.bean.po.CompeteVarietyScoreExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteVarietyScoreMapper { + long countByExample(CompeteVarietyScoreExample example); + + int deleteByExample(CompeteVarietyScoreExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteVarietyScore record); + + int insertSelective(CompeteVarietyScore record); + + List selectByExample(CompeteVarietyScoreExample example); + + CompeteVarietyScore selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteVarietyScore record, @Param("example") CompeteVarietyScoreExample example); + + int updateByExample(@Param("record") CompeteVarietyScore record, @Param("example") CompeteVarietyScoreExample example); + + int updateByPrimaryKeySelective(CompeteVarietyScore record); + + int updateByPrimaryKey(CompeteVarietyScore record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java new file mode 100644 index 00000000..972b3957 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -0,0 +1,68 @@ +package com.ccsens.mt.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.po.CompeteProjectConfig; +import com.ccsens.mt.bean.po.CompeteProjectConfigExample; +import com.ccsens.mt.bean.vo.TableVo; +import com.ccsens.mt.persist.dao.CompeteProjectConfigDao; +import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class CompeteTaskService implements ICompeteTaskService{ + @Resource + private CompeteProjectConfigDao projectConfigDao; + @Resource + private Snowflake snowflake; + + @Override + public List updateCompeteProjectConfig(List param) { + List competeProjectConfigs = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(param)){ + param.forEach(projectConfig -> { + CompeteProjectConfig competeProjectConfig; + CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample(); + projectConfigExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); + List projectConfigList = projectConfigDao.selectByExample(projectConfigExample); + log.info("查找项目配置信息：{}",projectConfigList); + if(CollectionUtil.isNotEmpty(projectConfigList)){ + //有则修改 + competeProjectConfig = projectConfigList.get(0); + competeProjectConfig.setProjectDuration(projectConfig.getDuration()); + competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); + competeProjectConfig.setStartTime(projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime()); + projectConfigDao.insertSelective(competeProjectConfig); + }else { + //没有则添加 + competeProjectConfig = new CompeteProjectConfig(); + competeProjectConfig.setId(snowflake.nextId()); + competeProjectConfig.setProjectId(projectConfig.getProjectId()); + competeProjectConfig.setProjectDuration(projectConfig.getDuration()); + competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); + competeProjectConfig.setStartTime(projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime()); + projectConfigDao.insertSelective(competeProjectConfig); + } + //返回 + TableVo.CompeteProjectConfig config = new TableVo.CompeteProjectConfig(); + }); + } + + return competeProjectConfigs; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java new file mode 100644 index 00000000..1ba25d4d --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.service; + +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.TableVo; + +import java.util.List; + +/** + * @author 逗 + */ +public interface ICompeteTaskService { + /** + * 修改日程安排 + * @param param + * @return + */ + List updateCompeteProjectConfig(List param); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index eeaeb964..bba62048 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -21,6 +21,7 @@ import com.ccsens.mt.util.Constant; import com.ccsens.util.CodeEnum; import com.ccsens.util.WebConstant; import com.ccsens.util.exception.BaseException; +import jdk.nashorn.internal.runtime.regexp.joni.CodeRangeBuffer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -498,9 +499,10 @@ public class ProvinceService implements IProvinceService { CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); } - //判断项目是个人还是团队，参加 + //判断项目是个人还是团队 if(competeProject.getTeam() == 0){ for(ProvinceCompeteDto.JoinProjectPlayer joinPlayer : param.getPlayers()){ + //检查此用户之前是否参加此项目 CompeteProjectPlayerExample example = new CompeteProjectPlayerExample(); example.createCriteria().andProjectIdEqualTo(competeProject.getId()).andPlayerIdEqualTo(joinPlayer.getPlayerId()) @@ -509,6 +511,12 @@ public class ProvinceService implements IProvinceService { //用户现在不参加且之前已经参加本项目，退出 if(joinPlayer.getJoinProject() == 0 && CollectionUtil.isNotEmpty(competeProjectPlayerList)) { competeProjectPlayerList.forEach(projectPlayer -> { + if(competeProject.getId() == Constant.SINGLE_ROLL_3_M || competeProject.getId() == Constant.SINGLE_ROLL_30_S){ + CompeteProjectPlayerExample projectPlayerExample1 = new CompeteProjectPlayerExample(); + projectPlayerExample1.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) + .andProjectIdEqualTo(Constant.CERTIFICATE); + throw new BaseException(CodeEnum.mtCertificateJoin("")); + } projectPlayer.setRecStatus((byte) 2); projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer); }); @@ -519,15 +527,32 @@ public class ProvinceService implements IProvinceService { if (ObjectUtil.isNull(player)) { throw new BaseException(CodeEnum.PARAM_ERROR); } + //通级赛查找用户是否参加“30秒单摇”和“3分钟单摇” + if(competeProject.getCertificate() == 1){ + CompeteProjectPlayerExample projectPlayerExample1 = new CompeteProjectPlayerExample(); + projectPlayerExample1.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) + .andProjectIdEqualTo(Constant.SINGLE_ROLL_30_S); + CompeteProjectPlayerExample projectPlayerExample2 = new CompeteProjectPlayerExample(); + projectPlayerExample2.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) + .andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M); + if(projectPlayerMapper.countByExample(projectPlayerExample1) == 0 || projectPlayerMapper.countByExample(projectPlayerExample2) == 0){ + throw new BaseException(CodeEnum.mtCertificate(player.getName())); + } + } //查找此公司此组别是否参加过这个项目 int num = competeCompanyDao.getNumByCompanyAndGroup(competeProject.getId(), player.getCompanyId(), player.getCompeteGroupId(), param.getCompeteTimeId()); if (num > 0) { throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg1("该项目该组别")); } //查找个人参赛数量是否符合（个人比赛3个） - CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); - projectPlayerExample.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); - if (projectPlayerMapper.countByExample(projectPlayerExample) >= 3) { + int joinNum = competeCompanyDao.selectJoinNumByPlayer(joinPlayer.getPlayerId(),param.getCompeteTimeId()); +// CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); +// projectPlayerExample.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) +// .andCompeteTimeIdEqualTo(param.getCompeteTimeId()); +// if (projectPlayerMapper.countByExample(projectPlayerExample) >= 3 && competeProject.getCertificate() == 0) { +// throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"个人")); +// } + if (joinNum >= 3 && competeProject.getCertificate() == 0) { throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"个人")); } //参加比赛记录 @@ -560,23 +585,6 @@ public class ProvinceService implements IProvinceService { competeTeamDao.insertSelective(competeTeam); } -// //检查参赛人数是否符合 -// int joinCount = 0; -// for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){ -// if(joinProject.getJoinProject() == 1){ -// joinCount++; -// }else { -// joinCount--; -// } -// } -// CompeteTeamMemberExample example = new CompeteTeamMemberExample(); -// example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); -// long memberNum = teamMemberMapper.countByExample(example); -// if(joinCount + memberNum > 0) { -// if (joinCount + memberNum > competeProject.getMemberMax() || joinCount + memberNum < competeProject.getMemberMin()) { -// throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); -// } -// } for (int i = 0; i < param.getPlayers().size(); i++) { ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i); CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId()); @@ -659,23 +667,6 @@ public class ProvinceService implements IProvinceService { competeTeamDao.insertSelective(competeTeam); } -// //检查参赛人数是否符合 -// int joinCount = 0; -// for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){ -// if(joinProject.getJoinProject() == 1){ -// joinCount++; -// }else { -// joinCount--; -// } -// } -// CompeteTeamMemberExample example = new CompeteTeamMemberExample(); -// example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); -// long memberNum = teamMemberMapper.countByExample(example); -// if(joinCount + memberNum > 0) { -// if (joinCount + memberNum > competeProject.getMemberMax() || joinCount + memberNum < competeProject.getMemberMin()) { -// throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); -// } -// } for (int i = 0; i < param.getPlayers().size(); i++) { ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i); CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId()); diff --git a/mt/src/main/java/com/ccsens/mt/service/VideoService.java b/mt/src/main/java/com/ccsens/mt/service/VideoService.java index a7629550..c732fe98 100644 --- a/mt/src/main/java/com/ccsens/mt/service/VideoService.java +++ b/mt/src/main/java/com/ccsens/mt/service/VideoService.java @@ -37,22 +37,23 @@ public class VideoService implements IVideoService{ */ @Override public List getVideoByPlayerId(QueryDto params) { - VideoDto.GetVideo getVideo = params.getParam(); - List getVideoInfoList = new ArrayList<>(); - CompeteVideoExample videoExample = new CompeteVideoExample(); - videoExample.createCriteria().andCompeteCodeEqualTo(getVideo.getCompeteCode()).andCompeteTimeIdEqualTo(getVideo.getCompeteTimeId()) - .andPlayerIdEqualTo(getVideo.getPlayerId()); - List competeVideoList = competeVideoMapper.selectByExample(videoExample); - if(CollectionUtil.isNotEmpty(competeVideoList)){ - competeVideoList.forEach(competeVideo -> { - VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); - getVideoInfo.setFileId(competeVideo.getFileId()); - getVideoInfo.setVideoId(competeVideo.getId()); - getVideoInfo.setUploadTime(competeVideo.getTime()); - getVideoInfoList.add(getVideoInfo); - }); - } - return getVideoInfoList; +// VideoDto.GetVideo getVideo = params.getParam(); +// List getVideoInfoList = new ArrayList<>(); +// CompeteVideoExample videoExample = new CompeteVideoExample(); +// videoExample.createCriteria().andCompeteCodeEqualTo(getVideo.getCompeteCode()).andCompeteTimeIdEqualTo(getVideo.getCompeteTimeId()) +// .andPlayerIdEqualTo(getVideo.getPlayerId()); +// List competeVideoList = competeVideoMapper.selectByExample(videoExample); +// if(CollectionUtil.isNotEmpty(competeVideoList)){ +// competeVideoList.forEach(competeVideo -> { +// VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); +// getVideoInfo.setFileId(competeVideo.getFileId()); +// getVideoInfo.setVideoId(competeVideo.getId()); +// getVideoInfo.setUploadTime(competeVideo.getTime()); +// getVideoInfoList.add(getVideoInfo); +// }); +// } +// return getVideoInfoList; + return null; } /** @@ -62,34 +63,35 @@ public class VideoService implements IVideoService{ */ @Override public List uploadVideo(QueryDto params) { - VideoDto.UploadVideo uploadVideo = params.getParam(); - //将视频信息储存数据库 - CompeteVideo competeVideo = new CompeteVideo(); - competeVideo.setId(snowflake.nextId()); - competeVideo.setCompeteCode(uploadVideo.getCompeteCode()); - competeVideo.setCompeteTimeId(uploadVideo.getCompeteTimeId()); - competeVideo.setTeam(uploadVideo.getTeam()); - competeVideo.setPlayerId(uploadVideo.getPlayerId()); - competeVideo.setFileId(uploadVideo.getVideoFileId()); - competeVideo.setVideoUrl(uploadVideo.getVideoFileUrl()); - competeVideo.setUploadUserId(params.getUserId()); - competeVideo.setTime(System.currentTimeMillis()); - competeVideoMapper.insertSelective(competeVideo); - //返回 - List getVideoInfoList = new ArrayList<>(); - CompeteVideoExample videoExample = new CompeteVideoExample(); - videoExample.createCriteria().andCompeteCodeEqualTo(uploadVideo.getCompeteCode()).andCompeteTimeIdEqualTo(uploadVideo.getCompeteTimeId()) - .andPlayerIdEqualTo(uploadVideo.getPlayerId()); - List competeVideoList = competeVideoMapper.selectByExample(videoExample); - if(CollectionUtil.isNotEmpty(competeVideoList)){ - competeVideoList.forEach(video -> { - VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); - getVideoInfo.setFileId(video.getFileId()); - getVideoInfo.setVideoId(video.getId()); - getVideoInfo.setUploadTime(video.getTime()); - getVideoInfoList.add(getVideoInfo); - }); - } - return getVideoInfoList; +// VideoDto.UploadVideo uploadVideo = params.getParam(); +// //将视频信息储存数据库 +// CompeteVideo competeVideo = new CompeteVideo(); +// competeVideo.setId(snowflake.nextId()); +// competeVideo.setCompeteCode(uploadVideo.getCompeteCode()); +// competeVideo.setCompeteTimeId(uploadVideo.getCompeteTimeId()); +// competeVideo.setTeam(uploadVideo.getTeam()); +// competeVideo.setPlayerId(uploadVideo.getPlayerId()); +// competeVideo.setFileId(uploadVideo.getVideoFileId()); +// competeVideo.setVideoUrl(uploadVideo.getVideoFileUrl()); +// competeVideo.setUploadUserId(params.getUserId()); +// competeVideo.setTime(System.currentTimeMillis()); +// competeVideoMapper.insertSelective(competeVideo); +// //返回 +// List getVideoInfoList = new ArrayList<>(); +// CompeteVideoExample videoExample = new CompeteVideoExample(); +// videoExample.createCriteria().andCompeteCodeEqualTo(uploadVideo.getCompeteCode()).andCompeteTimeIdEqualTo(uploadVideo.getCompeteTimeId()) +// .andPlayerIdEqualTo(uploadVideo.getPlayerId()); +// List competeVideoList = competeVideoMapper.selectByExample(videoExample); +// if(CollectionUtil.isNotEmpty(competeVideoList)){ +// competeVideoList.forEach(video -> { +// VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); +// getVideoInfo.setFileId(video.getFileId()); +// getVideoInfo.setVideoId(video.getId()); +// getVideoInfo.setUploadTime(video.getTime()); +// getVideoInfoList.add(getVideoInfo); +// }); +// } +// return getVideoInfoList; + return null; } } 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 5f3052c7..a855322f 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -34,6 +34,18 @@ public class Constant { } public static final int VOTE_TOTAL = 2; + /** + * 三十秒单摇跳项目id + */ + public static final long SINGLE_ROLL_30_S = 2011; + /** + * 三分钟单摇跳项目id + */ + public static final long SINGLE_ROLL_3_M = 2013; + /** + * 速度通级赛id + */ + public static final long CERTIFICATE = 2018; public final static class Compete{ public final static byte PROJECT_JOIN_RULE_GROUP_LIMIT = 0; diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index d082c0ea..5889ff7f 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index c48a4f4c..91ab5fab 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -386,4 +386,16 @@ and m.rec_status = 0 and p.rec_status = 0 + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml new file mode 100644 index 00000000..13d3e48c --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, compete_time_id, site_order_id, project_id, user_id, chief_judgment, created_at, + updated_at, rec_status + + + + + delete from t_compete_judgment + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_judgment + + + + + + insert into t_compete_judgment (id, compete_time_id, site_order_id, + project_id, user_id, chief_judgment, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{chiefJudgment,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_compete_judgment + + + id, + + + compete_time_id, + + + site_order_id, + + + project_id, + + + user_id, + + + chief_judgment, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{chiefJudgment,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_judgment + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_judgment + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_judgment + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_judgment + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml index 4e5cd89c..8e150359 100644 --- a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -3,7 +3,9 @@ + + @@ -69,7 +71,7 @@ - id, player_id, compete_order, site, created_at, updated_at, rec_status + id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status + select + + distinct + + + from t_compete_variety_score + + + + + order by ${orderByClause} + + + + + delete from t_compete_variety_score + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_variety_score + + + + + + insert into t_compete_variety_score (id, compete_time_id, project_id, + site_order_id, code, score, + judgment_id, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_compete_variety_score + + + id, + + + compete_time_id, + + + project_id, + + + site_order_id, + + + code, + + + score, + + + judgment_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{code,jdbcType=VARCHAR}, + + + #{score,jdbcType=INTEGER}, + + + #{judgmentId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_variety_score + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + score = #{record.score,jdbcType=INTEGER}, + + + judgment_id = #{record.judgmentId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_variety_score + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + score = #{record.score,jdbcType=INTEGER}, + judgment_id = #{record.judgmentId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_variety_score + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + code = #{code,jdbcType=VARCHAR}, + + + score = #{score,jdbcType=INTEGER}, + + + judgment_id = #{judgmentId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_variety_score + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + code = #{code,jdbcType=VARCHAR}, + score = #{score,jdbcType=INTEGER}, + judgment_id = #{judgmentId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 6fcb0eb5..2921824a 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -190,6 +190,14 @@ public enum CodeEnum { msg = msg+"已参加了其他组别，无法再次报名"; return msg; } + public static String mtCertificate(String msg){ + msg = msg+"未同时报名“30秒单摇跳”和“3分钟单摇跳”"; + return msg; + } + public static String mtCertificateJoin(String msg){ + msg = msg+"已报名“速度通级赛”无法取消当前项目"; + return msg; + } public CodeEnum mtProjectMsg(String msg){ this.msg = msg+"项目参赛次数已满"; return this;