From 1ef67e86193015d9b6ff2d8845e6396d741d7180 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 17 Sep 2020 14:09:30 +0800
Subject: [PATCH] 0917_1.0

---
 .../com/ccsens/mt/api/LevelController.java    |  2 +-
 .../ccsens/mt/service/ILevelUpService.java    |  2 +-
 .../com/ccsens/mt/service/LevelUpService.java | 26 +++++++++----------
 .../main/resources/mapper_dao/LevelUpDao.xml  |  6 ++++-
 .../com/ccsens/tall/service/UserService.java  |  1 +
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/api/LevelController.java b/mt/src/main/java/com/ccsens/mt/api/LevelController.java
index 053cabce..b2dc4f36 100644
--- a/mt/src/main/java/com/ccsens/mt/api/LevelController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/LevelController.java
@@ -36,7 +36,7 @@ public class LevelController {
     @RequestMapping(value = "/manual", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse manualLevelUpPlayer(@ApiParam @Validated @RequestBody QueryDto<LevelDto.ManualLevelUpDto> params) {
         log.info("手动晋级：{}",params);
-        levelUpService.manualLevelUpPlayer(params);
+        levelUpService.manualLevelUpPlayer(params.getParam());
         return JsonResponse.newInstance().ok();
     }
 
diff --git a/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java b/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java
index fd5e494e..b6ee16fc 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java
@@ -32,7 +32,7 @@ public interface ILevelUpService {
      * 手动晋级
      * @param params 比赛信息和晋级的选手信息
      */
-    void manualLevelUpPlayer(QueryDto<LevelDto.ManualLevelUpDto> params);
+    void manualLevelUpPlayer(LevelDto.ManualLevelUpDto params);
 
     /**
      * 查询比赛内晋级的选手信息
diff --git a/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java b/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java
index 574bb4e0..ee253691 100644
--- a/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/LevelUpService.java
@@ -84,7 +84,7 @@ public class LevelUpService implements ILevelUpService{
             levelUpDao.insertSelective(levelUp);
             //存入redis
             String key = Constant.Redis.COMPETE_LEVEL + levelUpDto.getCompeteTimeId() + "_" + levelUpDto.getCompeteCode();
-            redisUtil.zsSet(key, levelUser, 0);
+            redisUtil.zsSet(key, levelUser, 0,3600 * 24 * 300);
         }
 
     }
@@ -121,7 +121,7 @@ public class LevelUpService implements ILevelUpService{
                     updateLevelUpScore(autoLevelUpDto.getCompeteCode(), index.get(), Objects.requireNonNull(type.getScore()).intValue(), levelUser.getId());
                     //如果是符合晋级条件，添加新的晋级信息
                     if(index.get() <= finalLevelRule.getLevelCondition()){
-                        insertLevelUp(autoLevelUpDto.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser.getId(), (byte) 0);
+                        insertLevelUp(autoLevelUpDto.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser, (byte) 0);
                     }
                 });
                 break;
@@ -136,7 +136,7 @@ public class LevelUpService implements ILevelUpService{
                     updateLevelUpScore(autoLevelUpDto.getCompeteCode(), index.get(),  Objects.requireNonNull(type.getScore()).intValue(), levelUser.getId());
                     //如果是符合晋级条件，添加新的晋级信息
                     if(index.get() <= finalLevelRule.getLevelCondition() || score.get() == Objects.requireNonNull(type.getScore()).intValue()){
-                        insertLevelUp(autoLevelUpDto.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser.getId(), (byte) 0);
+                        insertLevelUp(autoLevelUpDto.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser, (byte) 0);
                     }
                     score.set(Objects.requireNonNull(type.getScore()).intValue());
                 });
@@ -151,7 +151,7 @@ public class LevelUpService implements ILevelUpService{
                     updateLevelUpScore(autoLevelUpDto.getCompeteCode(), index.get(),  Objects.requireNonNull(type.getScore()).intValue(), levelUser.getId());
                     //如果是符合晋级条件，添加新的晋级信息
                     if(Objects.requireNonNull(type.getScore()).intValue() >= finalLevelRule.getLevelCondition()){
-                        insertLevelUp(autoLevelUpDto.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser.getId(), (byte) 0);
+                        insertLevelUp(autoLevelUpDto.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser, (byte) 0);
                     }
                 });
                 break;
@@ -168,10 +168,10 @@ public class LevelUpService implements ILevelUpService{
     /**
      * 将晋级信息添加进数据库，存入redis
      */
-    private void insertLevelUp(Long competeTimeId, String competeCode, Long levelUser,byte levelUpType) {
+    private void insertLevelUp(Long competeTimeId, String competeCode, LevelUser levelUser,byte levelUpType) {
         LevelUp levelUp = new LevelUp();
         levelUp.setId(snowflake.nextId());
-        levelUp.setLevelUserId(levelUser);
+        levelUp.setLevelUserId(levelUser.getId());
         levelUp.setCompeteCode(competeCode);
         levelUp.setCompeteTimeId(competeTimeId);
         levelUp.setScore(0);
@@ -180,7 +180,7 @@ public class LevelUpService implements ILevelUpService{
         levelUpDao.insertSelective(levelUp);
         //存入redis
         String keyNew = Constant.Redis.COMPETE_LEVEL + competeTimeId + "_" + competeCode;
-        redisUtil.zsSet(keyNew, levelUp, 0);
+        redisUtil.zsSet(keyNew, levelUser, 0,3600 * 24 * 300);
     }
 
     /**
@@ -201,11 +201,10 @@ public class LevelUpService implements ILevelUpService{
 
     /**
      * 手动晋级
-     * @param params 比赛信息和晋级的选手信息
+     * @param manualLevelUp 比赛信息和晋级的选手信息
      */
     @Override
-    public void manualLevelUpPlayer(QueryDto<LevelDto.ManualLevelUpDto> params) {
-        LevelDto.ManualLevelUpDto manualLevelUp = params.getParam();
+    public void manualLevelUpPlayer(LevelDto.ManualLevelUpDto manualLevelUp) {
         //查找晋级规则，
         LevelRule levelRule = new LevelRule();
         LevelRuleExample levelRuleExample = new LevelRuleExample();
@@ -229,7 +228,7 @@ public class LevelUpService implements ILevelUpService{
             if(CollectionUtil.isNotEmpty(manualLevelUp.getManualLevelUpPlayers())){
                 manualLevelUp.getManualLevelUpPlayers().forEach(player -> {
                     if(player.getPlayerId().equals(levelUser.getPlayerId())){
-                        insertLevelUp(manualLevelUp.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser.getId(), (byte) 1);
+                        insertLevelUp(manualLevelUp.getCompeteTimeId(), finalLevelRule.getCompeteCodeLevelUp(), levelUser, (byte) 1);
                     }
                 });
             }
@@ -238,12 +237,11 @@ public class LevelUpService implements ILevelUpService{
 
     /**
      * 查询比赛内晋级的选手信息
-     * @param params 比赛id和分页信息
+     * @param levelUserInfo 比赛id和分页信息
      * @return 返回查到的比赛下所有晋级的选手的信息
      */
     @Override
-    public PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(LevelDto.QueryLevelUserInfo params) {
-        LevelDto.QueryLevelUserInfo levelUserInfo = params.getParam();
+    public PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(LevelDto.QueryLevelUserInfo levelUserInfo) {
         if(levelUserInfo.getPage() != -1){
             PageHelper.startPage(levelUserInfo.getPage(), levelUserInfo.getPageSize());
         }
diff --git a/mt/src/main/resources/mapper_dao/LevelUpDao.xml b/mt/src/main/resources/mapper_dao/LevelUpDao.xml
index 497a7405..c7b82fd3 100644
--- a/mt/src/main/resources/mapper_dao/LevelUpDao.xml
+++ b/mt/src/main/resources/mapper_dao/LevelUpDao.xml
@@ -3,7 +3,11 @@
 <mapper namespace="com.ccsens.mt.persist.dao.LevelUpDao">
 
     <select id="getByLevelUserIdAndCode" parameterType="java.util.Map" resultType="Long">
-        SELECT id FROM `t_level_up` WHERE level_user_id = #{levelUserId} and compete_code = #{competeCode}
+        SELECT id FROM `t_level_up`
+        WHERE level_user_id = #{levelUserId}
+        and compete_code = #{competeCode}
+        and rec_status = 0
+        LIMIT 1
     </select>
 
     <select id="queryLevelUserInfo" parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.LevelVo$QueryLevelUserInfo">
diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java
index 3c5d662f..6791c5ac 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java
@@ -1172,6 +1172,7 @@ public class UserService implements IUserService {
         long end1 = System.currentTimeMillis();
         log.info("查询用户信息用了：{}",end1 - start);
         UserVo.TokenBean tokenBean1 = generateToken(clientType, userSignVo.getUserId(), theMap);
+
         tokenBean.setToken(tokenBean1.getToken());
         tokenBean.setRefresh_token(tokenBean1.getRefresh_token());
 //        //获取手机号