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