20200903_5.0

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

@@ -49,6 +49,9 @@ public class CompeteDto {
     @Data
     @ApiModel("提交报名基本信息")
     public static class CompetePlayerInfo{
+        @NotNull
+        @ApiModelProperty("比赛的类型，0跳绳比赛")
+        private int type;
         @NotEmpty
         @ApiModelProperty("姓名")
         private String name;

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

@@ -10,7 +10,7 @@ public class CompeteProject implements Serializable {
 
     private Long parentId;
 
-    private Byte leve;
+    private Byte level;
 
     private Byte team;
 
@@ -56,12 +56,12 @@ public class CompeteProject implements Serializable {
         this.parentId = parentId;
     }
 
-    public Byte getLeve() {
-        return leve;
+    public Byte getLevel() {
+        return level;
     }
 
-    public void setLeve(Byte leve) {
-        this.leve = leve;
+    public void setLevel(Byte level) {
+        this.level = level;
     }
 
     public Byte getTeam() {
@@ -145,7 +145,7 @@ public class CompeteProject implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", name=").append(name);
         sb.append(", parentId=").append(parentId);
-        sb.append(", leve=").append(leve);
+        sb.append(", level=").append(level);
         sb.append(", team=").append(team);
         sb.append(", joinRule=").append(joinRule);
         sb.append(", certificate=").append(certificate);

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

@@ -295,63 +295,63 @@ public class CompeteProjectExample {
             return (Criteria) this;
         }
 
-        public Criteria andLeveIsNull() {
-            addCriterion("leve is null");
+        public Criteria andLevelIsNull() {
+            addCriterion("level is null");
             return (Criteria) this;
         }
 
-        public Criteria andLeveIsNotNull() {
-            addCriterion("leve is not null");
+        public Criteria andLevelIsNotNull() {
+            addCriterion("level is not null");
             return (Criteria) this;
         }
 
-        public Criteria andLeveEqualTo(Byte value) {
-            addCriterion("leve =", value, "leve");
+        public Criteria andLevelEqualTo(Byte value) {
+            addCriterion("level =", value, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveNotEqualTo(Byte value) {
-            addCriterion("leve <>", value, "leve");
+        public Criteria andLevelNotEqualTo(Byte value) {
+            addCriterion("level <>", value, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveGreaterThan(Byte value) {
-            addCriterion("leve >", value, "leve");
+        public Criteria andLevelGreaterThan(Byte value) {
+            addCriterion("level >", value, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveGreaterThanOrEqualTo(Byte value) {
-            addCriterion("leve >=", value, "leve");
+        public Criteria andLevelGreaterThanOrEqualTo(Byte value) {
+            addCriterion("level >=", value, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveLessThan(Byte value) {
-            addCriterion("leve <", value, "leve");
+        public Criteria andLevelLessThan(Byte value) {
+            addCriterion("level <", value, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveLessThanOrEqualTo(Byte value) {
-            addCriterion("leve <=", value, "leve");
+        public Criteria andLevelLessThanOrEqualTo(Byte value) {
+            addCriterion("level <=", value, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveIn(List<Byte> values) {
-            addCriterion("leve in", values, "leve");
+        public Criteria andLevelIn(List<Byte> values) {
+            addCriterion("level in", values, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveNotIn(List<Byte> values) {
-            addCriterion("leve not in", values, "leve");
+        public Criteria andLevelNotIn(List<Byte> values) {
+            addCriterion("level not in", values, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveBetween(Byte value1, Byte value2) {
-            addCriterion("leve between", value1, value2, "leve");
+        public Criteria andLevelBetween(Byte value1, Byte value2) {
+            addCriterion("level between", value1, value2, "level");
             return (Criteria) this;
         }
 
-        public Criteria andLeveNotBetween(Byte value1, Byte value2) {
-            addCriterion("leve not between", value1, value2, "leve");
+        public Criteria andLevelNotBetween(Byte value1, Byte value2) {
+            addCriterion("level not between", value1, value2, "level");
             return (Criteria) this;
         }
 

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -159,12 +159,14 @@ public class CompeteVo {
         private String name;
         @ApiModelProperty("是否是团队项目 0否 1是")
         private byte team;
+        @ApiModelProperty("参加限制，0同单位同组别，1同单位不限组别")
+        private byte joinRule;
         @ApiModelProperty("是否支持通级 0否 1是")
         private byte certificate;
         @ApiModelProperty("最少人数")
-        private byte memberMin;
+        private int memberMin;
         @ApiModelProperty("最多人数")
-        private byte memberMax;
+        private int memberMax;
     }
 
     @Data

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

@@ -26,4 +26,18 @@ public interface CompeteTimeDao extends CompeteTimeMapper {
      * @return 返回类型下的所有组别
      */
     List<CompeteVo.CompeteGroup> queryCompeteGroupByType(@Param("type") int type);
+
+    /**
+     * 根据类型查找所有参赛单位
+     * @param type 类型
+     * @return 所有参赛单位
+     */
+    List<CompeteVo.CompeteCompany> queryCompeteCompanyByType(@Param("type") int type);
+
+    /**
+     * 查看参赛项目信息
+     * @param type 类型
+     * @return 参赛项目信息
+     */
+    List<CompeteVo.CompeteProject> queryCompeteProjectByType(@Param("type") int type);
 }

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

@@ -1,15 +1,21 @@
 package com.ccsens.mt.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Snowflake;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.po.CompeteCompany;
 import com.ccsens.mt.bean.po.CompeteCompanyExample;
+import com.ccsens.mt.bean.po.CompetePlayer;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.persist.dao.CompeteTimeDao;
 import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
 import com.ccsens.mt.util.Constant;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.RedisKeyManager;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.exception.BaseException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -24,9 +30,11 @@ public class CompeteService implements ICompeteService{
     @Resource
     private CompeteTimeDao competeTimeDao;
     @Resource
+    private RedisUtil redisUtil;
+    @Resource
     private CompeteCompanyMapper competeCompanyMapper;
     @Resource
-    private RedisUtil redisUtil;
+    private Snowflake snowflake;
 
     /**
      * 查看第几届
@@ -54,15 +62,12 @@ public class CompeteService implements ICompeteService{
         CompeteDto.CompeteTypeAndKey competeTypeAndKey = params.getParam();
         String key = competeTypeAndKey.getType() + Constant.Redis.COMPETE_COMPANY;
         Object list = redisUtil.lGet(key,0,-1);
-        List<CompeteCompany> competeCompanyList = (List<CompeteCompany>) list;
+        List<CompeteVo.CompeteCompany> competeCompanyList = (List<CompeteVo.CompeteCompany>) list;
         List<CompeteVo.CompeteCompany> companyList = new ArrayList<>();
-        System.out.println(competeCompanyList);
+
         competeCompanyList.forEach(competeCompany -> {
-            if(competeCompany.getName().contains(competeTypeAndKey.getKey())){
-                CompeteVo.CompeteCompany company = new CompeteVo.CompeteCompany();
-                company.setGroupId(competeCompany.getId());
-                company.setGroupName(competeCompany.getName());
-                companyList.add(company);
+            if(competeCompany.getGroupName().contains(competeTypeAndKey.getKey())){
+                companyList.add(competeCompany);
             }
         });
         return companyList;
@@ -74,13 +79,15 @@ public class CompeteService implements ICompeteService{
     @Override
     public void syncCompeteCompany(QueryDto<CompeteDto.CompeteType> params) {
         CompeteDto.CompeteType competeType = params.getParam();
+        String key = competeType.getType() + Constant.Redis.COMPETE_COMPANY;
+        //删除之前的数据
+        redisUtil.del(key);
         //根据type查找数据库内所有参赛单位
-        CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
-        competeCompanyExample.createCriteria().andTypeEqualTo((byte) competeType.getType());
-        List<CompeteCompany> competeCompanyList = competeCompanyMapper.selectByExample(competeCompanyExample);
+        List<CompeteVo.CompeteCompany> competeCompanyList = competeTimeDao.queryCompeteCompanyByType(competeType.getType());
         if(CollectionUtil.isNotEmpty(competeCompanyList)){
-            String key = competeType.getType() + Constant.Redis.COMPETE_COMPANY;
-            redisUtil.lSet(key,competeCompanyList,Constant.Redis.COMPETE_COMPANY_TIME);
+            competeCompanyList.forEach(competeCompany -> {
+                redisUtil.lSet(key,competeCompany,Constant.Redis.COMPETE_COMPANY_TIME);
+            });
         }
     }
 
@@ -89,6 +96,35 @@ public class CompeteService implements ICompeteService{
      */
     @Override
     public CompeteVo.CompetePlayerInfo saveCompetePlayerInfo(QueryDto<CompeteDto.CompetePlayerInfo> params) {
+        CompeteDto.CompetePlayerInfo competePlayerInfo = params.getParam();
+        Long userId = params.getUserId();
+        //检查验证码是否正确
+        if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) {
+            throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
+        }
+        if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) {
+            throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
+        }
+        //添加基本信息
+        CompetePlayer player = new CompetePlayer();
+        BeanUtil.copyProperties(competePlayerInfo,player);
+        player.setId(snowflake.nextId());
+        player.setUserId(userId);
+        //检查参赛单位是否存在，不存在则添加
+        CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
+        competeCompanyExample.createCriteria().andNameEqualTo(competePlayerInfo.getCompanyName());
+        List<CompeteCompany> companyList = competeCompanyMapper.selectByExample(competeCompanyExample);
+        if(CollectionUtil.isEmpty(companyList)){
+            CompeteCompany company = new CompeteCompany();
+            company.setId(snowflake.nextId());
+            company.setType((byte) competePlayerInfo.getType());
+            company.setName(competePlayerInfo.getCompanyName());
+            player.setCompanyId(company.getId());
+        }else {
+            player.setCompanyId(companyList.get(0).getId());
+        }
+
+//        CompeteVo.CompetePlayerInfo playerInfo =
         return null;
     }
 
@@ -97,7 +133,8 @@ public class CompeteService implements ICompeteService{
      */
     @Override
     public List<CompeteVo.CompeteProject> queryCompeteProject(QueryDto<CompeteDto.CompeteType> params) {
-        return null;
+        CompeteDto.CompeteType competeType = params.getParam();
+        return competeTimeDao.queryCompeteProjectByType(competeType.getType());
     }
 
     /**

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

@@ -2,6 +2,20 @@
 <!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">
 
+    <resultMap id="compete_project" type="com.ccsens.mt.bean.vo.CompeteVo$CompeteProject">
+        <id column="parentProjectId" property="parentProjectId"/>
+        <result column="parentProjectName" property="parentProjectName"/>
+        <result column="type" property="type"/>
+        <collection property="secondProjects" ofType="com.ccsens.mt.bean.vo.CompeteVo$CompeteSecondProject">
+            <id column="id" property="id"/>
+            <result column="name" property="name"/>
+            <result column="team" property="team"/>
+            <result column="certificate" property="certificate"/>
+            <result column="memberMin" property="memberMin"/>
+            <result column="memberMax" property="memberMax"/>
+        </collection>
+    </resultMap>
+
     <select id="getCompeteTimeByType" parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTime">
         SELECT
         id,
@@ -38,4 +52,55 @@
         ORDER BY sequence
     </select>
 
+    <select id="queryCompeteCompanyByType"  parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteCompany">
+        SELECT
+            id as groupId,
+            `name` as groupName
+        FROM
+         t_compete_company
+        WHERE
+            rec_status = 0
+        and
+            type = #{type}
+    </select>
+
+    <select id="queryCompeteProjectByType"  parameterType="java.util.Map" resultMap="compete_project">
+        SELECT
+         p.id as parentProjectId,
+         p.`name` as parentProjectName,
+         p.type as type,
+         t.id as id,
+         t.`name` as name,
+         t.team as team,
+         t.join_rule as joinRule,
+         t.certificate as certificate,
+         t.member_min as memberMin,
+         t.member_max as memberMax
+        FROM
+        t_compete_project p LEFT JOIN
+        (
+            SELECT
+            id,
+            parent_id,
+            `name`,
+            team,
+            join_rule,
+            certificate,
+            member_min,
+            member_max
+            FROM
+            t_compete_project
+            WHERE
+                rec_status = 0
+            and
+            level = 2
+        ) t on t.parent_id = p.id
+        WHERE
+            rec_status = 0
+        and
+            type = #{type}
+        and
+            level = 1
+    </select>
+
 </mapper>

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
-    <result column="leve" jdbcType="TINYINT" property="leve" />
+    <result column="level" jdbcType="TINYINT" property="level" />
     <result column="team" jdbcType="TINYINT" property="team" />
     <result column="join_rule" jdbcType="TINYINT" property="joinRule" />
     <result column="certificate" jdbcType="TINYINT" property="certificate" />
@@ -75,7 +75,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, parent_id, leve, team, join_rule, certificate, member_min, member_max, 
+    id, name, parent_id, level, team, join_rule, certificate, member_min, member_max, 
     type, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteProjectExample" resultMap="BaseResultMap">
@@ -110,12 +110,12 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.mt.bean.po.CompeteProject">
     insert into t_compete_project (id, name, parent_id, 
-      leve, team, join_rule, 
+      level, team, join_rule, 
       certificate, member_min, member_max, 
       type, created_at, updated_at, 
       rec_status)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, 
-      #{leve,jdbcType=TINYINT}, #{team,jdbcType=TINYINT}, #{joinRule,jdbcType=TINYINT}, 
+      #{level,jdbcType=TINYINT}, #{team,jdbcType=TINYINT}, #{joinRule,jdbcType=TINYINT}, 
       #{certificate,jdbcType=TINYINT}, #{memberMin,jdbcType=INTEGER}, #{memberMax,jdbcType=INTEGER}, 
       #{type,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
       #{recStatus,jdbcType=TINYINT})
@@ -132,8 +132,8 @@
       <if test="parentId != null">
         parent_id,
       </if>
-      <if test="leve != null">
-        leve,
+      <if test="level != null">
+        level,
       </if>
       <if test="team != null">
         team,
@@ -173,8 +173,8 @@
       <if test="parentId != null">
         #{parentId,jdbcType=BIGINT},
       </if>
-      <if test="leve != null">
-        #{leve,jdbcType=TINYINT},
+      <if test="level != null">
+        #{level,jdbcType=TINYINT},
       </if>
       <if test="team != null">
         #{team,jdbcType=TINYINT},
@@ -223,8 +223,8 @@
       <if test="record.parentId != null">
         parent_id = #{record.parentId,jdbcType=BIGINT},
       </if>
-      <if test="record.leve != null">
-        leve = #{record.leve,jdbcType=TINYINT},
+      <if test="record.level != null">
+        level = #{record.level,jdbcType=TINYINT},
       </if>
       <if test="record.team != null">
         team = #{record.team,jdbcType=TINYINT},
@@ -263,7 +263,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
       parent_id = #{record.parentId,jdbcType=BIGINT},
-      leve = #{record.leve,jdbcType=TINYINT},
+      level = #{record.level,jdbcType=TINYINT},
       team = #{record.team,jdbcType=TINYINT},
       join_rule = #{record.joinRule,jdbcType=TINYINT},
       certificate = #{record.certificate,jdbcType=TINYINT},
@@ -286,8 +286,8 @@
       <if test="parentId != null">
         parent_id = #{parentId,jdbcType=BIGINT},
       </if>
-      <if test="leve != null">
-        leve = #{leve,jdbcType=TINYINT},
+      <if test="level != null">
+        level = #{level,jdbcType=TINYINT},
       </if>
       <if test="team != null">
         team = #{team,jdbcType=TINYINT},
@@ -323,7 +323,7 @@
     update t_compete_project
     set name = #{name,jdbcType=VARCHAR},
       parent_id = #{parentId,jdbcType=BIGINT},
-      leve = #{leve,jdbcType=TINYINT},
+      level = #{level,jdbcType=TINYINT},
       team = #{team,jdbcType=TINYINT},
       join_rule = #{joinRule,jdbcType=TINYINT},
       certificate = #{certificate,jdbcType=TINYINT},

util/src/main/java/com/ccsens/util/QrCodeUtil.java

@@ -13,6 +13,8 @@ import java.io.*;
  */
 public class QrCodeUtil {
 
+
+
     /**
      * 根据文件路径生成二维码
      * @param url

util/src/main/java/com/ccsens/util/RedisUtil.java

@@ -514,7 +514,7 @@ public class RedisUtil {
      * @param time  时间(秒)
      * @return
      */
-    public boolean lSet(String key, List<Object> value, long time) {
+    public boolean lSet(String key, List<? extends Object> value, long time) {
         try {
             redisTemplate.opsForList().rightPushAll(key, value);
             if (time > 0) expire(key, time);