团队成员表添加团队id

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author 逗
  */
@@ -12,6 +15,7 @@ public class CompeteDto {
     @Data
     @ApiModel
     public static class CompeteType{
+        @NotNull
         @ApiModelProperty("比赛的类型，0跳绳比赛")
         private int type;
     }
@@ -19,12 +23,14 @@ public class CompeteDto {
     @Data
     @ApiModel
     public static class CompeteTime{
+        @NotNull
         @ApiModelProperty("第几届信息的id")
         private Long competeTimeId;
     }
     @Data
     @ApiModel
     public static class CompeteProjectPlayer{
+        @NotNull
         @ApiModelProperty("选手创建的团队id")
         private Long projectPlayerId;
     }
@@ -32,8 +38,10 @@ public class CompeteDto {
     @Data
     @ApiModel("关键字模糊查询")
     public static class CompeteTypeAndKey{
+        @NotEmpty
         @ApiModelProperty("关键字")
         private String key;
+        @NotNull
         @ApiModelProperty("比赛的类型，0跳绳比赛")
         private int type;
     }
@@ -41,18 +49,25 @@ public class CompeteDto {
     @Data
     @ApiModel("提交报名基本信息")
     public static class CompetePlayerInfo{
+        @NotEmpty
         @ApiModelProperty("姓名")
         private String name;
+        @NotNull
         @ApiModelProperty("性别 0女 1男")
         private int gender;
+        @NotEmpty
         @ApiModelProperty("手机号")
         private String phone;
+        @NotEmpty
         @ApiModelProperty("手机验证码")
         private String smsCode;
+        @NotEmpty
         @ApiModelProperty("身份证")
         private String idCard;
+        @NotNull
         @ApiModelProperty("参加的组别的id")
         private Long groupId;
+        @NotEmpty
         @ApiModelProperty("参赛单位的名字")
         private String companyName;
         @ApiModelProperty("身份证正面照文件的路径/户口本照片")
@@ -66,10 +81,12 @@ public class CompeteDto {
     @Data
     @ApiModel("选择参赛项目")
     public static class CompeteProject{
+        @NotNull
         @ApiModelProperty("比赛项目id（二级的）")
         private Long competeProjectId;
         @ApiModelProperty("是否通级 0否 1是")
         private byte certificate;
+        @NotNull
         @ApiModelProperty("第几届信息的id")
         private Long competeTimeId;
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamMember.java

@@ -8,6 +8,8 @@ public class CompeteTeamMember implements Serializable {
 
     private Long playerId;
 
+    private Long competeTeamId;
+
     private Byte captain;
 
     private Date createdAt;
@@ -34,6 +36,14 @@ public class CompeteTeamMember implements Serializable {
         this.playerId = playerId;
     }
 
+    public Long getCompeteTeamId() {
+        return competeTeamId;
+    }
+
+    public void setCompeteTeamId(Long competeTeamId) {
+        this.competeTeamId = competeTeamId;
+    }
+
     public Byte getCaptain() {
         return captain;
     }
@@ -74,6 +84,7 @@ public class CompeteTeamMember implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", playerId=").append(playerId);
+        sb.append(", competeTeamId=").append(competeTeamId);
         sb.append(", captain=").append(captain);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);

mt/src/main/java/com/ccsens/mt/bean/po/CompeteTeamMemberExample.java

@@ -225,6 +225,66 @@ public class CompeteTeamMemberExample {
             return (Criteria) this;
         }
 
+        public Criteria andCompeteTeamIdIsNull() {
+            addCriterion("compete_team_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdIsNotNull() {
+            addCriterion("compete_team_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdEqualTo(Long value) {
+            addCriterion("compete_team_id =", value, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdNotEqualTo(Long value) {
+            addCriterion("compete_team_id <>", value, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdGreaterThan(Long value) {
+            addCriterion("compete_team_id >", value, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("compete_team_id >=", value, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdLessThan(Long value) {
+            addCriterion("compete_team_id <", value, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdLessThanOrEqualTo(Long value) {
+            addCriterion("compete_team_id <=", value, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdIn(List<Long> values) {
+            addCriterion("compete_team_id in", values, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdNotIn(List<Long> values) {
+            addCriterion("compete_team_id not in", values, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdBetween(Long value1, Long value2) {
+            addCriterion("compete_team_id between", value1, value2, "competeTeamId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompeteTeamIdNotBetween(Long value1, Long value2) {
+            addCriterion("compete_team_id not between", value1, value2, "competeTeamId");
+            return (Criteria) this;
+        }
+
         public Criteria andCaptainIsNull() {
             addCriterion("captain is null");
             return (Criteria) this;

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java

@@ -0,0 +1,29 @@
+package com.ccsens.mt.persist.dao;
+
+import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.persist.mapper.CompeteTimeMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Repository
+public interface CompeteTimeDao extends CompeteTimeMapper {
+    /**
+     * 通过类型查找第几届和时间
+     * @param type 类型
+     * @param time 当前时间
+     * @return 返回当前这一届的信息
+     */
+    CompeteVo.CompeteTime getCompeteTimeByType(@Param("type") int type, @Param("time") long time);
+
+    /**
+     * 根据类型查看所有的组别
+     * @param type 类型
+     * @return 返回类型下的所有组别
+     */
+    List<CompeteVo.CompeteGroup> queryCompeteGroupByType(@Param("type") int type);
+}

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -2,9 +2,11 @@ package com.ccsens.mt.service;
 
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.persist.dao.CompeteTimeDao;
 import com.ccsens.util.bean.dto.QueryDto;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -12,13 +14,16 @@ import java.util.List;
  */
 @Service
 public class CompeteService implements ICompeteService{
+    @Resource
+    private CompeteTimeDao competeTimeDao;
 
     /**
      * 查看第几届
      */
     @Override
     public CompeteVo.CompeteTime getCompeteTime(QueryDto<CompeteDto.CompeteType> params) {
-        return null;
+        CompeteDto.CompeteType competeType = params.getParam();
+        return competeTimeDao.getCompeteTimeByType(competeType.getType(),System.currentTimeMillis());
     }
 
     /**
@@ -26,7 +31,8 @@ public class CompeteService implements ICompeteService{
      */
     @Override
     public List<CompeteVo.CompeteGroup> queryCompeteGroup(QueryDto<CompeteDto.CompeteType> params) {
-        return null;
+        CompeteDto.CompeteType competeType = params.getParam();
+        return competeTimeDao.queryCompeteGroupByType(competeType.getType());
     }
 
     /**
@@ -34,6 +40,7 @@ public class CompeteService implements ICompeteService{
      */
     @Override
     public List<CompeteVo.CompeteCompany> queryCompeteCompany(QueryDto<CompeteDto.CompeteTypeAndKey> params) {
+
         return null;
     }
 
@@ -42,7 +49,8 @@ public class CompeteService implements ICompeteService{
      */
     @Override
     public void syncCompeteCompany(QueryDto<CompeteDto.CompeteType> params) {
-
+        //根据type查找数据库内所有参赛单位
+        //将单位信息存入redis
     }
 
     /**

mt/src/main/resources/mapper_dao/CompeteTimeDao.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.mt.persist.dao.CompeteTimeDao">
+
+    <select id="getCompeteTimeByType" parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTime">
+        SELECT
+        id,
+        `name`,
+        type,
+        start_time as startTime,
+        end_time as endTime,
+        sign_up_start_time as signUpStartTime,
+        sign_up_end_time as signUpEndTime,
+        compete_status as competeStatus
+        FROM
+        `t_compete_time`
+        WHERE
+        rec_status = 0
+        and
+        `type` = #{type}
+        and
+        start_time &lt;= #{time}
+        and
+        end_time &gt; #{time}
+    </select>
+
+    <select id="queryCompeteGroupByType" parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteGroup">
+        SELECT
+            id as groupId,
+            group_name as groupName,
+            description as groupDescription
+        FROM
+            t_compete_group
+        WHERE
+            rec_status = #{type}
+        and
+            type = 0
+        ORDER BY sequence
+    </select>
+
+</mapper>

mt/src/main/resources/mapper_raw/CompeteTeamMemberMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.ccsens.mt.bean.po.CompeteTeamMember">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="player_id" jdbcType="BIGINT" property="playerId" />
+    <result column="compete_team_id" jdbcType="BIGINT" property="competeTeamId" />
     <result column="captain" jdbcType="TINYINT" property="captain" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -68,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, player_id, captain, created_at, updated_at, rec_status
+    id, player_id, compete_team_id, captain, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamMemberExample" resultMap="BaseResultMap">
     select
@@ -101,12 +102,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteTeamMember">
-    insert into t_compete_team_member (id, player_id, captain, 
+    insert into t_compete_team_member (id, player_id, compete_team_id, 
-      created_at, updated_at, rec_status
+      captain, created_at, updated_at, 
-      )
+      rec_status)
-    values (#{id,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{captain,jdbcType=TINYINT}, 
+    values (#{id,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{competeTeamId,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      #{captain,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      )
+      #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteTeamMember">
     insert into t_compete_team_member
@@ -117,6 +118,9 @@
       <if test="playerId != null">
         player_id,
       </if>
+      <if test="competeTeamId != null">
+        compete_team_id,
+      </if>
       <if test="captain != null">
         captain,
       </if>
@@ -137,6 +141,9 @@
       <if test="playerId != null">
         #{playerId,jdbcType=BIGINT},
       </if>
+      <if test="competeTeamId != null">
+        #{competeTeamId,jdbcType=BIGINT},
+      </if>
       <if test="captain != null">
         #{captain,jdbcType=TINYINT},
       </if>
@@ -166,6 +173,9 @@
       <if test="record.playerId != null">
         player_id = #{record.playerId,jdbcType=BIGINT},
       </if>
+      <if test="record.competeTeamId != null">
+        compete_team_id = #{record.competeTeamId,jdbcType=BIGINT},
+      </if>
       <if test="record.captain != null">
         captain = #{record.captain,jdbcType=TINYINT},
       </if>
@@ -187,6 +197,7 @@
     update t_compete_team_member
     set id = #{record.id,jdbcType=BIGINT},
       player_id = #{record.playerId,jdbcType=BIGINT},
+      compete_team_id = #{record.competeTeamId,jdbcType=BIGINT},
       captain = #{record.captain,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -201,6 +212,9 @@
       <if test="playerId != null">
         player_id = #{playerId,jdbcType=BIGINT},
       </if>
+      <if test="competeTeamId != null">
+        compete_team_id = #{competeTeamId,jdbcType=BIGINT},
+      </if>
       <if test="captain != null">
         captain = #{captain,jdbcType=TINYINT},
       </if>
@@ -219,6 +233,7 @@
   <update id="updateByPrimaryKey" parameterType="com.ccsens.mt.bean.po.CompeteTeamMember">
     update t_compete_team_member
     set player_id = #{playerId,jdbcType=BIGINT},
+      compete_team_id = #{competeTeamId,jdbcType=BIGINT},
       captain = #{captain,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},