a版本同步

src/main/java/com/izouma/awesomeadmin/service/impl/HouseInfoServiceImpl.java

@@ -259,17 +259,22 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                 int typeFlag = AppConstant.NoticeType.RESULT;
 
 //                if (AppConstant.PlayerStatus.PROCESSED_FAIL == playerInfo.getStatusFlag()) {
-//
-//                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-//                            + "开始的游戏竞赛 [" + houseInfo.getHouseName()
-//                            + "]，[无有效结果]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
-//                    typeFlag = AppConstant.NoticeType.FAIL;
-//                } else
+                if (playerInfo.getDataError()) {
+
+                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                            + "开始的游戏竞赛 [" + houseInfo.getHouseName()
+                            + "]，[中检测到你 游戏数据异常，判断游戏失败]";
 
-                if (AppConstant.PlayerStatus.OVERTIME == playerInfo.getStatusFlag()) {
+                    typeFlag = AppConstant.NoticeType.FAIL;
+                }else if(AppConstant.PlayerStatus.PROCESSED_FAIL == playerInfo.getStatusFlag()){
+                    content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
+                            + "开始的游戏竞赛 [" + houseInfo.getHouseName()
+                            + "]中，[第:"+ playerInfo.getHouseRank()+"名,没有获得奖牌]";
+                    typeFlag = AppConstant.NoticeType.FAIL;
+                } else if (AppConstant.PlayerStatus.OVERTIME == playerInfo.getStatusFlag()) {
                     content = "很遗憾，你在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
                             + "开始的游戏竞赛 [" + houseInfo.getHouseName()
-                            + "]，[比赛超时]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                            + "]，[比赛超时，判断游戏失败]";
                     typeFlag = AppConstant.NoticeType.OVERTIME;
                 } else {
                     if (houseInfo.getScoreType() == 0) {//评分模式
@@ -282,7 +287,7 @@ public class HouseInfoServiceImpl implements HouseInfoService {
 
                                 content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
                                         + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（评分模式）评分[第" + playerInfo.getHouseRank()
-                                        + "名]，获得一枚金牌，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                                        + "名，获得一枚金牌]";
                             }
                             if (i == 1) {//第二名 银牌
                                 playerInfo.setMedal(AppConstant.Medals.SILVER);
@@ -290,7 +295,7 @@ public class HouseInfoServiceImpl implements HouseInfoService {
 
                                 content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
                                         + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（评分模式）评分[第" + playerInfo.getHouseRank()
-                                        + "名]，获得一枚银牌，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                                        + "名，获得一枚银牌]";
                             }
                             if (i == 2) {//第三名 铜牌
                                 playerInfo.setMedal(AppConstant.Medals.BRONZE);
@@ -298,7 +303,7 @@ public class HouseInfoServiceImpl implements HouseInfoService {
 
                                 content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
                                         + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（评分模式）评分[第" + playerInfo.getHouseRank()
-                                        + "名]，获得一枚铜牌，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                                        + "名，获得一枚铜牌]";
                             }
 
 
@@ -306,7 +311,7 @@ public class HouseInfoServiceImpl implements HouseInfoService {
 
                             content = "很遗憾，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
                                     + "开始的游戏竞赛[ " + houseInfo.getHouseName() + "]（评分模式）评分[第" + playerInfo.getHouseRank()
-                                    + "名]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                                    + "名]，没有获得奖牌";
                             typeFlag = AppConstant.NoticeType.RESULT;
                         }
                     } else {
@@ -316,10 +321,10 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                             bonus = BigDecimal.valueOf(AppConstant.Medals.PLATINUM_SCORE);
 
                             content = "恭喜你，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（吃鸡模式）[成功吃鸡]，获得一枚铂金奖牌，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（吃鸡模式）[成功吃鸡，获得一枚铂金奖牌]";
                         } else {
                             content = "很遗憾，在" + DateTimeTool.dateTimeToTimeYYYYHHmmStr(houseInfo.getBeginTime())
-                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（吃鸡模式）[没有吃鸡]，无法获得奖励，该局参赛人数[" + houseInfo.getPlayerNumber() + "]人。";
+                                    + "开始的游戏竞赛 [" + houseInfo.getHouseName() + "]（吃鸡模式）[没有吃鸡，没有获得奖牌]";
                             typeFlag = AppConstant.NoticeType.RESULT;
                         }
                     }
@@ -982,10 +987,10 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                 })
                 .collect(Collectors.toList());
         list.removeAll(range2);
-        //list.forEach(playerInfo -> playerInfo.setPoints(new BigDecimal(-10)));
+        list.forEach(playerInfo -> playerInfo.setDataError(true));
         sorted.addAll(range2);
         sorted.addAll(list);
-        return list;
+        return sorted;
     }
 
     private long getGameTime(PlayerInfo playerInfo) {

src/main/vue/src/pages/PlayerInfos.vue

@@ -649,7 +649,7 @@ export default {
             this.imageDialogVisible = true;
         },
         download(path) {
-            let url = path.replace("/var", "http://47.96.141.102:8080");
+            let url = path.replace("/var", "http://123.58.240.138:8080");
             window.open(url);
         },
         getStatus(row) {