0821_1.0

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;
     }

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;

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;

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;

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;

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;

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;

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

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);