From d9417e4a26cd3d9a9ccd79bcc830300906d16ce4 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 10 Dec 2020 09:16:02 +0800
Subject: [PATCH] =?UTF-8?q?20201210=E6=B8=B8=E6=88=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=86=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/game/bean/vo/ScreenVo.java     |  2 ++
 .../service/RabbitMQListenerGameTest.java     | 27 -------------------
 .../ccsens/game/service/ScreenService.java    |  4 +--
 game/src/main/resources/application.yml       |  4 +--
 4 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java

diff --git a/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java b/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
index 3d077b2d..fc6f05a6 100644
--- a/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
+++ b/game/src/main/java/com/ccsens/game/bean/vo/ScreenVo.java
@@ -121,6 +121,8 @@ public class ScreenVo {
         private Long startLocalTime;
         @ApiModelProperty("本地结束时间")
         private Long endLocalTime;
+        @ApiModelProperty("分组别赛时的计分规则，0总分 1平均分")
+        private int rankRule;
         @ApiModelProperty("分组信息")
         private List<GroupVo> groups ;
 
diff --git a/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java b/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java
deleted file mode 100644
index e4baaf31..00000000
--- a/game/src/main/java/com/ccsens/game/service/RabbitMQListenerGameTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-//package com.ccsens.game.service;
-//
-//import com.ccsens.util.config.RabbitMQConfig;
-//import lombok.extern.slf4j.Slf4j;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.stereotype.Component;
-//
-//import java.io.IOException;
-//
-//@Slf4j
-//@Component
-//@RabbitListener(queues = RabbitMQConfig.GAME_MQ_A)
-//public class RabbitMQListenerGameTest {
-//    private Logger logger = LoggerFactory.getLogger(RabbitMQListener.class);
-//
-//
-//    @RabbitHandler
-//    public void gameTest(String gameTest) throws IOException {
-//        System.out.println("============================="+gameTest);
-////        List<GameMessageWithChangeStatusOut> gameMessageList = JacksonUtil.jsonToBean(messageJson,
-////                GameMessageWithChangeStatusOut.class, true);
-//        log.info("测试游戏MQ消息 {}",gameTest);
-//    }
-//}
diff --git a/game/src/main/java/com/ccsens/game/service/ScreenService.java b/game/src/main/java/com/ccsens/game/service/ScreenService.java
index 7f00f78d..d06d028a 100644
--- a/game/src/main/java/com/ccsens/game/service/ScreenService.java
+++ b/game/src/main/java/com/ccsens/game/service/ScreenService.java
@@ -558,11 +558,11 @@ public class ScreenService implements IScreenService {
         GameType gameType = gameTypeDao.selectByPrimaryKey(gameUserPay.getGameTypeId());
         gameStatusVo.setGameStatus(gameRecord.getGameStatus());
         //返回开始结束时间和时长
-
         gameStatusVo.setStartLocalTime(gameRecord.getStartTime() + gameRecord.getTimeDifference());
         gameStatusVo.setEndLocalTime(gameRecord.getEndTime() + gameRecord.getTimeDifference());
         gameStatusVo.setDuration(gameRecord.getDuration());
-
+        //返回计分规则
+        gameStatusVo.setRankRule(gameRecord.getRankRule());
         //获取分组的信息
         List<ScreenVo.GroupVo> groupVo = getGroupScore2(gameRecord);
         gameStatusVo.setGroups(groupVo);
diff --git a/game/src/main/resources/application.yml b/game/src/main/resources/application.yml
index 5c2cd5c4..76317132 100644
--- a/game/src/main/resources/application.yml
+++ b/game/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
\ No newline at end of file
+    active: prodsd
+    include: common, util-prod
\ No newline at end of file