From 081aa384f1fe9a9c689139c320db4164a7fdee84 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 21 Aug 2020 17:53:59 +0800
Subject: [PATCH] 0821_1.0

---
 .../ccsens/game/bean/dto/message/AckMessageDto.java  |  3 +--
 .../bean/dto/message/AuthMessageWithAnswerDto.java   |  3 +--
 .../game/bean/dto/message/ChromeMessageDto.java      |  3 +--
 .../game/bean/dto/message/GameMessageCountOut.java   |  5 +----
 .../dto/message/GameMessageWithChangeStatusIn.java   |  3 +--
 .../bean/dto/message/GameMessageWithGetUrlDto.java   |  3 +--
 .../game/bean/dto/message/HeartMessageDto.java       |  3 +--
 .../game/bean/dto/message/PPTCtlMessageDto.java      |  5 +----
 .../ccsens/game/netty/wsserver/WebSocketHandler.java | 12 +++++++++++-
 9 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/AckMessageDto.java b/game/src/main/java/com/ccsens/game/bean/dto/message/AckMessageDto.java
index a17ca984..c301eee5 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/AckMessageDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/AckMessageDto.java
@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 public class AckMessageDto extends BaseMessageDto {
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data {
         Long msgId;
     }
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/AuthMessageWithAnswerDto.java b/game/src/main/java/com/ccsens/game/bean/dto/message/AuthMessageWithAnswerDto.java
index 386d7827..e9c879b1 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/AuthMessageWithAnswerDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/AuthMessageWithAnswerDto.java
@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 public class AuthMessageWithAnswerDto extends BaseMessageDto{
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         private Boolean success;
         private String phase;
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/ChromeMessageDto.java b/game/src/main/java/com/ccsens/game/bean/dto/message/ChromeMessageDto.java
index ae294814..1e5a2bc9 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/ChromeMessageDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/ChromeMessageDto.java
@@ -10,8 +10,7 @@ import lombok.Setter;
  */
 @Data
 public class ChromeMessageDto extends BaseMessageDto{
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         private Long projectId;
         private Long recordId;
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageCountOut.java b/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageCountOut.java
index e093c701..986ce9e4 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageCountOut.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageCountOut.java
@@ -2,12 +2,9 @@ package com.ccsens.game.bean.dto.message;
 
 import com.ccsens.util.WebConstant;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 @Data
 public class GameMessageCountOut extends BaseMessageDto {
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         private int totalTimes;
         private int totalScore;
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithChangeStatusIn.java b/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithChangeStatusIn.java
index ef6a4426..980f0663 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithChangeStatusIn.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithChangeStatusIn.java
@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 public class GameMessageWithChangeStatusIn extends BaseMessageDto{
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         private String recordId;
         private int gameStatus;
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithGetUrlDto.java b/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithGetUrlDto.java
index 6688cd46..78717b3e 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithGetUrlDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/GameMessageWithGetUrlDto.java
@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 public class GameMessageWithGetUrlDto extends BaseMessageDto {
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         private Long recordId;
         private String url;
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/HeartMessageDto.java b/game/src/main/java/com/ccsens/game/bean/dto/message/HeartMessageDto.java
index bd19b18a..9e3a7e51 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/HeartMessageDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/HeartMessageDto.java
@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 public class HeartMessageDto extends BaseMessageDto{
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         private int major;
         private int minor;
diff --git a/game/src/main/java/com/ccsens/game/bean/dto/message/PPTCtlMessageDto.java b/game/src/main/java/com/ccsens/game/bean/dto/message/PPTCtlMessageDto.java
index 3ba14032..cf5c8d31 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/message/PPTCtlMessageDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/message/PPTCtlMessageDto.java
@@ -2,16 +2,13 @@ package com.ccsens.game.bean.dto.message;
 
 import com.ccsens.util.WebConstant;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * @author __zHangSan
  */
 @Data
 public class PPTCtlMessageDto extends BaseMessageDto{
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data{
         /**
          * Supported Operation: up,down,begin,end
diff --git a/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java b/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java
index ffc96f45..f46f530a 100644
--- a/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java
+++ b/game/src/main/java/com/ccsens/game/netty/wsserver/WebSocketHandler.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ccsens.game.bean.dto.ClientDto;
 import com.ccsens.game.bean.dto.message.*;
 import com.ccsens.game.bean.po.GameGroup;
+import com.ccsens.game.bean.po.GameRecord;
 import com.ccsens.game.netty.ChannelManager;
 import com.ccsens.game.service.IClientService;
 import com.ccsens.game.service.IMessageService;
@@ -151,10 +152,19 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<BaseMessageDto
     public GameMessageCountOut clientAddTimes(String userId, String recordId) {
         GameMessageCountOut gameMessageCountOut = new GameMessageCountOut();
         log.info("userId:{}", userId);
-        if (StrUtil.isBlank(userId) || StrUtil.isBlank(userId)) {
+        if (StrUtil.isBlank(userId) || StrUtil.isBlank(recordId)) {
             return gameMessageCountOut;
         }
+
         Long recordIdLong = Long.parseLong(recordId);
+        String gameRecordStr = (String) redisUtil.get(GameConstant.generateGameStatusKey(recordIdLong));
+        if(StrUtil.isEmpty(gameRecordStr)){
+            return gameMessageCountOut;
+        }
+        GameRecord record = JSON.parseObject(gameRecordStr, GameRecord.class);
+        if(record.getGameStatus() == GameConstant.GAME_COMPLETED){
+            return gameMessageCountOut;
+        }
         String gameUserKey = GameConstant.generateGameKey(recordIdLong);
         Set<ZSetOperations.TypedTuple<Object>> typedTuples = redisUtil.zsRevGetWithScore(gameUserKey, 0, -1);