最最后一次

game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java

@@ -68,7 +68,7 @@ public class ScreenVo {
     @ApiModel("进行中")
     public static class ProcessingData{
         @ApiModelProperty("前十名的信息")
-        private List<TopUsers> topUsers;
+        private List<TopUsers> topMembers;
     }
 
     @Data

game/src/main/java/com/ccsens/game/service/MessageService.java

@@ -8,6 +8,7 @@ import com.ccsens.game.bean.po.GameUserJoinExample;
 import com.ccsens.game.netty.ChannelManager;
 import com.ccsens.game.persist.dao.GameUserJoinDao;
 import com.ccsens.util.JacksonUtil;
+import com.ccsens.util.WebConstant;
 import com.ccsens.util.config.RabbitMQConfig;
 import io.netty.channel.ChannelHandlerContext;
 import org.springframework.amqp.core.AmqpTemplate;
@@ -88,21 +89,24 @@ public class MessageService implements IMessageService {
         gameUserJoinExample.createCriteria().andRecordIdEqualTo(recordId);
         List<GameUserJoin> userJoinList = gameUserJoinDao.selectByExample(gameUserJoinExample);
         if (CollectionUtil.isNotEmpty(userJoinList)) {
-            for(GameUserJoin userJoin : userJoinList){
-                sendTo(userJoin.getUserId().toString(),gameMessage);
+            for (GameUserJoin userJoin : userJoinList) {
+                sendTo(userJoin.getUserId().toString(), gameMessage);
             }
         }
     }
 
     /**
      * 发送状态改变的消息
+     *
      * @param gameMessages
      */
     @Override
     public void doChangeStatusMessage(List<GameMessageWithChangeStatusOut> gameMessages) {
-        if(CollectionUtil.isNotEmpty(gameMessages)){
-            gameMessages.forEach(gameMessage ->{
-                sendTo(gameMessage.getUserId().toString(),gameMessage.getData());
+        if (CollectionUtil.isNotEmpty(gameMessages)) {
+            gameMessages.forEach(gameMessage -> {
+                gameMessage.setType(WebConstant.Message_Type.ChangeStatus.phase);
+
+                sendTo(gameMessage.getUserId().toString(), gameMessage.getData());
 //                List<ChangeStatusMessageDto> changeStatusMessageDtoList = gameMessage.getData().getChangeStatusMessageDto();
 //                if(CollectionUtil.isNotEmpty(changeStatusMessageDtoList)){
 //                    for(ChangeStatusMessageDto changeStatus : changeStatusMessageDtoList){

game/src/main/java/com/ccsens/game/service/RabbitMQListener.java

@@ -1,8 +1,10 @@
 package com.ccsens.game.service;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.ccsens.game.bean.dto.message.GameMessageWithChangeStatusOut;
 import com.ccsens.util.JacksonUtil;
+import com.ccsens.util.WebConstant;
 import com.ccsens.util.config.RabbitMQConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +28,9 @@ public class RabbitMQListener {
     @RabbitHandler
     public void process(String messageJson) throws IOException {
         System.out.println("*************"+messageJson);
+        List<GameMessageWithChangeStatusOut> gameMessageList = JacksonUtil.jsonToBean(messageJson,
+                GameMessageWithChangeStatusOut.class, true);
+
 
         messageService.doChangeStatusMessage(JacksonUtil.jsonToBean(messageJson,
                 GameMessageWithChangeStatusOut.class, true));

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -6,9 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.game.bean.dto.ScreenDto;
 import com.ccsens.game.bean.dto.message.BaseMessageDto;
-import com.ccsens.game.bean.dto.message.ChangeStatusMessageDto;
 import com.ccsens.game.bean.dto.message.ChromeMessageDto;
-import com.ccsens.game.bean.dto.message.GameMessageWithChangeStatusOut;
 import com.ccsens.game.bean.po.*;
 import com.ccsens.game.bean.vo.ScreenVo;
 import com.ccsens.game.persist.dao.*;
@@ -21,7 +19,6 @@ import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.netflix.discovery.converters.Auto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -263,7 +260,7 @@ public class ScreenService implements IScreenService{
                 // TODO
                 List<ScreenVo.TopUsers> tops = gameUserJoinDao.selectTopTen(gameRecord.getId());
                 ScreenVo.ProcessingData processingData = new ScreenVo.ProcessingData();
-                processingData.setTopUsers(tops);
+                processingData.setTopMembers(tops);
                 gameStatusVo.setProcessingData(processingData);
 
 

game/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test