20190122排名

src/main/java/com/izouma/awesomeadmin/constant/AppConstant.java

@@ -293,4 +293,41 @@ public interface AppConstant {
          */
         String PHYSICAL = "1";
     }
+
+    /**
+     * 房间状态
+     */
+    public interface HouseStatus {
+
+        /**
+         * 等待
+         */
+        Integer WAIT = 0;
+
+        /**
+         * 准备
+         */
+        Integer READY = 1;
+
+        /**
+         * 开始
+         */
+        Integer START = 2;
+
+        /**
+         * 结束
+         */
+        Integer END = 3;
+
+        /**
+         * 结算
+         */
+        Integer SETTLEMENT = 4;
+
+        /**
+         * 关闭
+         */
+        Integer CLOSE = 5;
+
+    }
 }

src/main/java/com/izouma/awesomeadmin/dao/HouseInfoMapper.java

@@ -29,5 +29,7 @@ public interface HouseInfoMapper{
     HouseInfo queryHouseInfo(HouseInfo record);
 
     List<HouseInfo> query(HouseInfo record);
+
+    int joinHouseInfo(HouseInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/HouseInfoMapper.xml

@@ -363,8 +363,18 @@
         </if>
 
     </update>
+    <update id="joinHouseInfo" parameterType="com.izouma.awesomeadmin.model.HouseInfo">
+        update house_info
+        <set>
+
+            player_number = ifnull(player_number, 0) + #{playerNumber},
+            bonus = ifnull(bonus, 0) + #{bonus},
+        </set>
+        where
+        id = #{id,jdbcType=INTEGER}
+    </update>
     <select id="queryHouseInfoByPage" parameterType="java.util.Map"
-            resultType="com.izouma.awesomeadmin.model.HouseInfo">
+            resultMap="PageHouseInfoResult">
         select
         <include refid="Base_Column_List"/>
         from house_info
@@ -820,5 +830,14 @@
 
     </resultMap>
 
+    <resultMap id="PageHouseInfoResult" type="com.izouma.awesomeadmin.model.HouseInfo" extends="BaseResultMap">
+
+        <association property="houseLevelInfo"
+                     javaType="com.izouma.awesomeadmin.model.HouseLevel"
+                     select="com.izouma.awesomeadmin.dao.HouseLevelMapper.queryHouseLevel"
+                     column="{ id = house_level }"/>
+
+    </resultMap>
+
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/PlayerInfoMapper.java

@@ -29,5 +29,9 @@ public interface PlayerInfoMapper{
     PlayerInfo queryPlayerInfo(PlayerInfo record);
 
     List<PlayerInfo> query(PlayerInfo record);
+
+    List<PlayerInfo> queryPlayerInfoRankByPage(Map<String, Object> parameter);
+
+    int userRank(PlayerInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/model/PlayerInfo.java

@@ -2,13 +2,14 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class PlayerInfo{
+public class PlayerInfo {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -36,234 +37,279 @@ public class PlayerInfo{
     private String gameType;
     private Integer seasonId;
 
-private String idStr;
+    private Integer houseRank;
+
+
+    private UserInfo userInfo;
+
+    private String idStr;
 
-private String searchKey;
+    private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public Integer getGameId(){
+
+    public Integer getGameId() {
         return this.gameId;
     }
 
-    public void setGameId(Integer gameId){
+    public void setGameId(Integer gameId) {
         this.gameId = gameId;
     }
-    public Integer getHouseId(){
+
+    public Integer getHouseId() {
         return this.houseId;
     }
 
-    public void setHouseId(Integer houseId){
+    public void setHouseId(Integer houseId) {
         this.houseId = houseId;
     }
-    public Date getJoinTime(){
+
+    public Date getJoinTime() {
         return this.joinTime;
     }
 
-    public void setJoinTime(Date joinTime){
+    public void setJoinTime(Date joinTime) {
         this.joinTime = joinTime;
     }
-    public BigDecimal getPrincipal(){
+
+    public BigDecimal getPrincipal() {
         return this.principal;
     }
 
-    public void setPrincipal(BigDecimal principal){
+    public void setPrincipal(BigDecimal principal) {
         this.principal = principal;
     }
-    public BigDecimal getBonus(){
+
+    public BigDecimal getBonus() {
         return this.bonus;
     }
 
-    public void setBonus(BigDecimal bonus){
+    public void setBonus(BigDecimal bonus) {
         this.bonus = bonus;
     }
-    public Integer getUserId(){
+
+    public Integer getUserId() {
         return this.userId;
     }
 
-    public void setUserId(Integer userId){
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-    public String getImage(){
+
+    public String getImage() {
         return this.image;
     }
 
-    public void setImage(String image){
+    public void setImage(String image) {
         this.image = image;
     }
-    public Integer getKillNumber(){
+
+    public Integer getKillNumber() {
         return this.killNumber;
     }
 
-    public void setKillNumber(Integer killNumber){
+    public void setKillNumber(Integer killNumber) {
         this.killNumber = killNumber;
     }
-    public Integer getRanking(){
+
+    public Integer getRanking() {
         return this.ranking;
     }
 
-    public void setRanking(Integer ranking){
+    public void setRanking(Integer ranking) {
         this.ranking = ranking;
     }
-    public Date getBeginTime(){
+
+    public Date getBeginTime() {
         return this.beginTime;
     }
 
-    public void setBeginTime(Date beginTime){
+    public void setBeginTime(Date beginTime) {
         this.beginTime = beginTime;
     }
-    public Date getEndTime(){
+
+    public Date getEndTime() {
         return this.endTime;
     }
 
-    public void setEndTime(Date endTime){
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-    public Integer getStatusFlag(){
+
+    public Integer getStatusFlag() {
         return this.statusFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag){
+    public void setStatusFlag(Integer statusFlag) {
         this.statusFlag = statusFlag;
     }
-    public String getExamineUser(){
+
+    public String getExamineUser() {
         return this.examineUser;
     }
 
-    public void setExamineUser(String examineUser){
+    public void setExamineUser(String examineUser) {
         this.examineUser = examineUser;
     }
-    public Date getExamineTime(){
+
+    public Date getExamineTime() {
         return this.examineTime;
     }
 
-    public void setExamineTime(Date examineTime){
+    public void setExamineTime(Date examineTime) {
         this.examineTime = examineTime;
     }
-    public Integer getExamineType(){
+
+    public Integer getExamineType() {
         return this.examineType;
     }
 
-    public void setExamineType(Integer examineType){
+    public void setExamineType(Integer examineType) {
         this.examineType = examineType;
     }
-    public String getVideo(){
+
+    public String getVideo() {
         return this.video;
     }
 
-    public void setVideo(String video){
+    public void setVideo(String video) {
         this.video = video;
     }
-    public String getLiveTime(){
+
+    public String getLiveTime() {
         return this.liveTime;
     }
 
-    public void setLiveTime(String liveTime){
+    public void setLiveTime(String liveTime) {
         this.liveTime = liveTime;
     }
-    public String getGameType(){
+
+    public String getGameType() {
         return this.gameType;
     }
 
-    public void setGameType(String gameType){
+    public void setGameType(String gameType) {
         this.gameType = gameType;
     }
-    public Integer getSeasonId(){
+
+    public Integer getSeasonId() {
         return this.seasonId;
     }
 
-    public void setSeasonId(Integer seasonId){
+    public void setSeasonId(Integer seasonId) {
         this.seasonId = seasonId;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
-public String getIdStr() {
-    return idStr;
-}
+    public String getIdStr() {
+        return idStr;
+    }
 
-public void setIdStr(String idStr) {
-    this.idStr = idStr;
-}
+    public void setIdStr(String idStr) {
+        this.idStr = idStr;
+    }
 
+    public Integer getHouseRank() {
+        return houseRank;
+    }
+
+    public void setHouseRank(Integer houseRank) {
+        this.houseRank = houseRank;
+    }
+
+    public UserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/PlayerInfoService.java

@@ -23,5 +23,9 @@ public interface PlayerInfoService{
     boolean deletePlayerInfo(PlayerInfo record);
 
     boolean updatePlayerInfo(PlayerInfo record);
+
+    List<PlayerInfo> getPlayerInfoRankByPage(Page page, PlayerInfo record);
+
+    int userRank(PlayerInfo record);
 }
 

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

@@ -158,6 +158,15 @@ public class HouseInfoServiceImpl implements HouseInfoService {
         logger.info("joinHouseInfo");
         try {
 
+            if (record.getUserId() == null) {
+                return new Result(false, "加入失败，用户不存在！");
+            }
+
+            if (record.getHouseId() == null) {
+                return new Result(false, "加入失败，房间不存在！");
+            }
+
+
             UserInfo userInfo = new UserInfo();
             userInfo.setId(record.getUserId());
             userInfo = userInfoService.getSingleUserInfo(userInfo);
@@ -169,9 +178,21 @@ public class HouseInfoServiceImpl implements HouseInfoService {
             HouseInfo houseInfo = new HouseInfo();
             houseInfo.setId(record.getHouseId());
             houseInfo = houseInfoMapper.queryHouseInfo(houseInfo);
-            if (houseInfo != null) {
+            if (houseInfo == null) {
                 return new Result(false, "加入失败，房间不存在！");
             }
+
+            if (houseInfo.getStatusFlag() > AppConstant.HouseStatus.READY) {
+
+                return new Result(false, "加入失败，游戏已开始！");
+            }
+
+            //检查是否重复加入
+            PlayerInfo playerInfo = playerInfoService.getPlayerInfo(record);
+            if (playerInfo != null) {
+                return new Result(false, "加入失败，不能重复加入");
+            }
+
             double entryCoin = 50;
 
             HouseLevel houseLevel = houseInfo.getHouseLevelInfo();
@@ -188,6 +209,7 @@ public class HouseInfoServiceImpl implements HouseInfoService {
                 return new Result(false, "加入失败，余额不足");
             }
 
+
             record.setGameId(houseInfo.getGameId());
             record.setHouseId(houseInfo.getId());
             record.setJoinTime(new Date());
@@ -221,6 +243,13 @@ public class HouseInfoServiceImpl implements HouseInfoService {
             userInfoService.updateUserInfo(updateUser);
 
 
+            HouseInfo joinHouseInfo = new HouseInfo();
+            joinHouseInfo.setId(houseInfo.getId());
+            joinHouseInfo.setPlayerNumber(1);
+            joinHouseInfo.setBonus(BigDecimal.valueOf(entryCoin));
+
+            houseInfoMapper.joinHouseInfo(joinHouseInfo);
+
             return new Result(true, "加入成功");
 
 

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

@@ -52,6 +52,24 @@ public class PlayerInfoServiceImpl implements PlayerInfoService{
         return null;
     }
 
+    @Override
+    public List<PlayerInfo> getPlayerInfoRankByPage(Page page, PlayerInfo record) {
+
+        logger.info("queryPlayerInfoRankByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return playerInfoMapper.queryPlayerInfoRankByPage(parameter);
+        } catch (Exception e) {
+        logger.error("queryPlayerInfoRankByPage", e);
+        }
+
+        return null;
+    }
+
     @Override
     public PlayerInfo getPlayerInfoById(String id) {
 
@@ -80,6 +98,21 @@ public class PlayerInfoServiceImpl implements PlayerInfoService{
         return null;
     }
 
+    @Override
+    public int userRank(PlayerInfo record) {
+
+        logger.info("getPlayerInfo");
+        try {
+
+            return playerInfoMapper.userRank(record);
+
+        } catch (Exception e) {
+        logger.error("getPlayerInfo", e);
+        }
+
+        return 0;
+    }
+
     @Override
     public boolean createPlayerInfo(PlayerInfo record) {
 

src/main/java/com/izouma/awesomeadmin/web/HouseInfoController.java

@@ -186,11 +186,7 @@ public class HouseInfoController {
     @RequestMapping(value = "/join", method = RequestMethod.POST)
     @ResponseBody
     public Result joinHouseInfo(PlayerInfo record) {
-        boolean num = houseInfoService.joinHouseInfo(record);
-        if (num) {
-            return new Result(true, "保存成功");
-        }
-        return new Result(false, "保存异常");
+        return houseInfoService.joinHouseInfo(record);
     }
 
 }

src/main/java/com/izouma/awesomeadmin/web/PlayerInfoController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/playerInfo")
 public class PlayerInfoController {
@@ -28,8 +28,8 @@ public class PlayerInfoController {
     private PlayerInfoService playerInfoService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class PlayerInfoController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getPlayerInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getPlayerInfo(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class PlayerInfoController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(PlayerInfo record) {
@@ -58,120 +58,158 @@ public class PlayerInfoController {
         return new Result(true, data);
     }
 
+    @RequestMapping(value = "/check", method = RequestMethod.GET)
+    @ResponseBody
+    public Result check(PlayerInfo record) {
+        PlayerInfo data = playerInfoService.getPlayerInfo(record);
+
+        if (data != null) {
+
+            return new Result(false, "玩家已存在");
+        }
+        return new Result(true, "玩家不存在");
+
+    }
+
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, PlayerInfo record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<PlayerInfo> pp =playerInfoService.getPlayerInfoByPage(page, record);
+        List<PlayerInfo> pp = playerInfoService.getPlayerInfoByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
         return new Result(true, result);
     }
 
+    /**
+     * <p>分页排名查询。</p>
+     */
+    @RequestMapping(value = "/rankPage", method = RequestMethod.GET)
+    @ResponseBody
+    public Result rankPage(Page page, PlayerInfo record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<PlayerInfo> pp = playerInfoService.getPlayerInfoRankByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+    @RequestMapping(value = "/userRank", method = RequestMethod.GET)
+    @ResponseBody
+    public Result userRank(PlayerInfo record) {
+
+        int rank = playerInfoService.userRank(record);
+
+        return new Result(true, rank);
+    }
+
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(PlayerInfo record) {
         boolean num = playerInfoService.createPlayerInfo(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updatePlayerInfo(PlayerInfo record) {
         boolean num = playerInfoService.updatePlayerInfo(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deletePlayerInfo(PlayerInfo record) {
 
         boolean num = playerInfoService.deletePlayerInfo(record);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, PlayerInfo record) throws Exception {
 
-    List<PlayerInfo> playerInfos = playerInfoService.getPlayerInfoList(record);
+        List<PlayerInfo> playerInfos = playerInfoService.getPlayerInfoList(record);
 
 
         String sheetName = "player_info";
         String titleName = "参赛人员数据表";
         String fileName = "参赛人员表";
         int columnNumber = 26;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "游戏ID" ,   "房间ID" ,   "加入时间" ,   "本金" ,   "奖金" ,   "用户" ,   "备注" ,   "截图" ,   "击败玩家" ,   "游戏排名" ,   "开始时间" ,   "结束时间" ,   "状态" ,   "审核人" ,   "审核时间" ,   "审核类型" ,   "视频地址" ,   "存活时长" ,   "游戏类型" ,   "赛季ID"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"ID", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "游戏ID", "房间ID", "加入时间", "本金", "奖金", "用户", "备注", "截图", "击败玩家", "游戏排名", "开始时间", "结束时间", "状态", "审核人", "审核时间", "审核类型", "视频地址", "存活时长", "游戏类型", "赛季ID"};
         String[][] dataList = new String[playerInfos.size()][26];
 
         for (int i = 0; i < playerInfos.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(playerInfos.get(i).getId());
-                        dataList[i][1] = String.valueOf(playerInfos.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(playerInfos.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(playerInfos.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(playerInfos.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(playerInfos.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(playerInfos.get(i).getGameId());
-                        dataList[i][7] = String.valueOf(playerInfos.get(i).getHouseId());
-                        dataList[i][8] = String.valueOf(playerInfos.get(i).getJoinTime());
-                        dataList[i][9] = String.valueOf(playerInfos.get(i).getPrincipal());
-                        dataList[i][10] = String.valueOf(playerInfos.get(i).getBonus());
-                        dataList[i][11] = String.valueOf(playerInfos.get(i).getUserId());
-                        dataList[i][12] = String.valueOf(playerInfos.get(i).getRemark());
-                        dataList[i][13] = String.valueOf(playerInfos.get(i).getImage());
-                        dataList[i][14] = String.valueOf(playerInfos.get(i).getKillNumber());
-                        dataList[i][15] = String.valueOf(playerInfos.get(i).getRanking());
-                        dataList[i][16] = String.valueOf(playerInfos.get(i).getBeginTime());
-                        dataList[i][17] = String.valueOf(playerInfos.get(i).getEndTime());
-                        dataList[i][18] = String.valueOf(playerInfos.get(i).getStatusFlag());
-                        dataList[i][19] = String.valueOf(playerInfos.get(i).getExamineUser());
-                        dataList[i][20] = String.valueOf(playerInfos.get(i).getExamineTime());
-                        dataList[i][21] = String.valueOf(playerInfos.get(i).getExamineType());
-                        dataList[i][22] = String.valueOf(playerInfos.get(i).getVideo());
-                        dataList[i][23] = String.valueOf(playerInfos.get(i).getLiveTime());
-                        dataList[i][24] = String.valueOf(playerInfos.get(i).getGameType());
-                        dataList[i][25] = String.valueOf(playerInfos.get(i).getSeasonId());
-                    }
+            dataList[i][0] = String.valueOf(playerInfos.get(i).getId());
+            dataList[i][1] = String.valueOf(playerInfos.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(playerInfos.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(playerInfos.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(playerInfos.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(playerInfos.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(playerInfos.get(i).getGameId());
+            dataList[i][7] = String.valueOf(playerInfos.get(i).getHouseId());
+            dataList[i][8] = String.valueOf(playerInfos.get(i).getJoinTime());
+            dataList[i][9] = String.valueOf(playerInfos.get(i).getPrincipal());
+            dataList[i][10] = String.valueOf(playerInfos.get(i).getBonus());
+            dataList[i][11] = String.valueOf(playerInfos.get(i).getUserId());
+            dataList[i][12] = String.valueOf(playerInfos.get(i).getRemark());
+            dataList[i][13] = String.valueOf(playerInfos.get(i).getImage());
+            dataList[i][14] = String.valueOf(playerInfos.get(i).getKillNumber());
+            dataList[i][15] = String.valueOf(playerInfos.get(i).getRanking());
+            dataList[i][16] = String.valueOf(playerInfos.get(i).getBeginTime());
+            dataList[i][17] = String.valueOf(playerInfos.get(i).getEndTime());
+            dataList[i][18] = String.valueOf(playerInfos.get(i).getStatusFlag());
+            dataList[i][19] = String.valueOf(playerInfos.get(i).getExamineUser());
+            dataList[i][20] = String.valueOf(playerInfos.get(i).getExamineTime());
+            dataList[i][21] = String.valueOf(playerInfos.get(i).getExamineType());
+            dataList[i][22] = String.valueOf(playerInfos.get(i).getVideo());
+            dataList[i][23] = String.valueOf(playerInfos.get(i).getLiveTime());
+            dataList[i][24] = String.valueOf(playerInfos.get(i).getGameType());
+            dataList[i][25] = String.valueOf(playerInfos.get(i).getSeasonId());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
 
 
-        }
     }
+}