From 7501140cf637fef9629a80202907ed067c8a5a06 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 三月 2024 20:07:45 +0800 Subject: [PATCH] 添加方法 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java | 554 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 554 insertions(+), 0 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java index 3806327..f3c89ee 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java @@ -1,10 +1,32 @@ package com.dsh.communityWorldCup.service.impl; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dsh.communityWorldCup.entity.WorldCup; import com.dsh.communityWorldCup.entity.WorldCupCompetitor; +import com.dsh.communityWorldCup.feignclient.account.AppUserClient; +import com.dsh.communityWorldCup.feignclient.account.StudentClient; +import com.dsh.communityWorldCup.feignclient.account.model.AppUser; +import com.dsh.communityWorldCup.feignclient.account.model.AppUserIdsByCityName; +import com.dsh.communityWorldCup.feignclient.account.model.TStudent; +import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient; +import com.dsh.communityWorldCup.feignclient.competition.model.Participant; +import com.dsh.communityWorldCup.feignclient.other.StoreClient; import com.dsh.communityWorldCup.mapper.WorldCupCompetitorMapper; +import com.dsh.communityWorldCup.model.*; import com.dsh.communityWorldCup.service.IWorldCupCompetitorService; +import com.dsh.communityWorldCup.service.IWorldCupService; +import com.dsh.communityWorldCup.util.ToolUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; +import java.text.SimpleDateFormat; +import java.util.*; /** * @author zhibing.pu @@ -12,4 +34,536 @@ */ @Service public class WorldCupCompetitorServiceImpl extends ServiceImpl<WorldCupCompetitorMapper, WorldCupCompetitor> implements IWorldCupCompetitorService { + + @Resource + private StudentClient studentClient; + + @Resource + private ParticipantClient participantClient; + + @Resource + private AppUserClient appUserClient; + + @Autowired + private IWorldCupService worldCupService; + + + + + + /** + * 获取参赛人员名次信息 + * @param entrantRank + * @return + */ + @Override + public EntrantRankVo getEntrantRank(EntrantRank entrantRank) { + EntrantRankVo entrantRankVo = new EntrantRankVo(); + if(entrantRank.getIsStudent() == 0){ + //参赛人员 + Participant participant = participantClient.getParticipant(entrantRank.getId()); + entrantRankVo.setName(participant.getName()); + }else{ + //学员 + TStudent tStudent = studentClient.queryById(entrantRank.getId().intValue()); + entrantRankVo.setName(tStudent.getName()); + } + //全国排名---直接数据库分组查询后排序 + entrantRankVo.setNationalRank(0); + List<Map<String, Object>> mapList = this.baseMapper.getNumberOfGamesRanked(null); + for (int i = 0; i < mapList.size(); i++) { + Map<String, Object> map = mapList.get(i); + Integer participantType = Integer.valueOf(map.get("participantType").toString()); + Integer participantId = Integer.valueOf(map.get("participantId").toString()); + Integer num = Integer.valueOf(map.get("num").toString()); + if(null != participantId && participantId.equals(entrantRank.getId()) && participantType.equals(entrantRank.getIsStudent())){ + entrantRankVo.setNationalRank(i + 1); + } + } + /** + * 城市排名 + * 1、先查询出当前用户对应的城市 + * 2、再根据城市查询对应的所有人员 + * 3、再根据查询出来的参赛人分组查询出参赛次数后排序 + */ + entrantRankVo.setCityRank(0); + AppUser appUser = appUserClient.getAppUser(entrantRank.getAppUserId()); + entrantRankVo.setCityName(appUser.getCity()); + List<Integer> appUserIds = appUserClient.getAppUserIds(appUser.getCityCode()); + List<Map<String, Object>> mapList1 = this.baseMapper.getNumberOfGamesRanked(appUserIds); + for (int i = 0; i < mapList1.size(); i++) { + Map<String, Object> map = mapList1.get(i); + Integer participantType = Integer.valueOf(map.get("participantType").toString()); + Integer participantId = Integer.valueOf(map.get("participantId").toString()); + Integer num = Integer.valueOf(map.get("num").toString()); + if(null != participantId && participantId.equals(entrantRank.getId()) && participantType.equals(entrantRank.getIsStudent())){ + entrantRankVo.setCityRank(i + 1); + } + } + QueryWrapper<WorldCupCompetitor> wrapper = new QueryWrapper<>(); + if(entrantRank.getIsStudent() == 0){ + wrapper.eq("participantType", 2); + }else{ + wrapper.eq("participantType", 1); + } + int win = this.count(wrapper.eq("participantId", entrantRank.getId()).eq("matchResult", 1)); + entrantRankVo.setWin(win); + + wrapper = new QueryWrapper<>(); + if(entrantRank.getIsStudent() == 0){ + wrapper.eq("participantType", 2); + }else{ + wrapper.eq("participantType", 1); + } + int lose = this.count(wrapper.eq("participantId", entrantRank.getId()).eq("matchResult", -1)); + entrantRankVo.setLose(lose); + if((win + lose) == 0){ + entrantRankVo.setWinRate(0D); + }else{ + entrantRankVo.setWinRate(new BigDecimal(win).divide(new BigDecimal(win + lose), new MathContext(4, RoundingMode.HALF_EVEN)).multiply(new BigDecimal(100)).doubleValue()); + } + return entrantRankVo; + } + + + /** + * 获取比赛记录 + * @param matchRecord + * @return + */ + @Override + public MatchRecordVo getMatchRecord(MatchRecord matchRecord) { + matchRecord.setIsStudent(matchRecord.getIsStudent() == 0 ? 2 : 1); + int pageNo = (matchRecord.getPageNo() - 1) * matchRecord.getPageSize(); + matchRecord.setPageNo(pageNo); + MatchRecordVo matchRecordVo = new MatchRecordVo(); + int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("participantId", matchRecord.getId()) + .eq("participantType", matchRecord.getIsStudent())); + matchRecordVo.setTotalSession(count); + List<MatchRecordList> matchRecord1 = this.baseMapper.getMatchRecord(matchRecord); + matchRecordVo.setList(matchRecord1); + return matchRecordVo; + } + + + /** + * 获取参赛排名 + * @param worldCupRank + * @return + */ + @Override + public List<WorldCupRankVo> getWorldCupRank(WorldCupRank worldCupRank) { + worldCupRank.setIsStudent(worldCupRank.getIsStudent() == 0 ? 2 : 1); + List<Integer> appUserIds = null; + if(worldCupRank.getRadius() == 2){ + AppUser appUser = appUserClient.getAppUser(worldCupRank.getAppUserId()); + appUserIds = appUserClient.getAppUserIds(appUser.getCityCode()); + } + List<Map<String, Object>> lists = this.baseMapper.getWorldCupRank(worldCupRank, appUserIds); + List<WorldCupRankVo> list = new ArrayList<>(); + for (int i = 0; i < lists.size(); i++) { + Map<String, Object> map = lists.get(i); + Integer participantType = Integer.valueOf(map.get("participantType").toString()); + Long participantId = Long.valueOf(map.get("participantId").toString()); + Integer appUserId = Integer.valueOf(map.get("appUserId").toString()); + Integer totalSession = Integer.valueOf(map.get("totalSession").toString()); + Double winRate = Double.valueOf(map.get("winRate").toString()); + //自己排名在20内的标识 + boolean b = false; + if(i <= 19){ + WorldCupRankVo worldCupRankVo = new WorldCupRankVo(); + worldCupRankVo.setRank(i + 1); + worldCupRankVo.setTotalSession(totalSession); + worldCupRankVo.setWinRate(winRate); + //学员 + if(participantType == 1){ + TStudent tStudent = studentClient.queryById(participantId.intValue()); + worldCupRankVo.setAvatar(tStudent.getHeadImg()); + String name = tStudent.getName(); + if(name.length() > 2){ + name = name.charAt(0) + "*" + name.substring(2); + }else{ + name = name.charAt(0) + "*"; + } + worldCupRankVo.setName(name); + } + //参赛人员 + if(participantType == 2){ + AppUser appUser1 = appUserClient.getAppUser(appUserId); + Participant participant = participantClient.getParticipant(participantId); + worldCupRankVo.setAvatar(appUser1.getHeadImg()); + String name = participant.getName(); + if(name.length() > 2){ + name = name.charAt(0) + "*" + name.substring(2); + }else{ + name = name.charAt(0) + "*"; + } + worldCupRankVo.setName(name); + + } + if(worldCupRank.getIsStudent().equals(participantType) && worldCupRank.getId().equals(participantId)){ + worldCupRankVo.setOneself(1); + b = true; + }else{ + worldCupRankVo.setOneself(0); + } + + list.add(worldCupRankVo); + } + //排名20内,且包含自己直接返回 + if(i == 19 && b){ + break; + } + //排名前20的数据添加完成后且包含自己,需要将自己找出来后添加到21位 + if(i > 19 && !b){ + if(worldCupRank.getIsStudent().equals(participantType) && worldCupRank.getId().equals(participantId)){ + WorldCupRankVo worldCupRankVo = new WorldCupRankVo(); + worldCupRankVo.setRank(i + 1); + worldCupRankVo.setTotalSession(totalSession); + worldCupRankVo.setWinRate(winRate); + //学员 + if(participantType == 1){ + TStudent tStudent = studentClient.queryById(participantId.intValue()); + worldCupRankVo.setAvatar(tStudent.getHeadImg()); + String name = tStudent.getName(); + if(name.length() > 2){ + name = name.charAt(0) + "*" + name.substring(2); + }else{ + name = name.charAt(0) + "*"; + } + worldCupRankVo.setName(name); + } + //参赛人员 + if(participantType == 2){ + AppUser appUser1 = appUserClient.getAppUser(appUserId); + Participant participant = participantClient.getParticipant(participantId); + worldCupRankVo.setAvatar(appUser1.getHeadImg()); + String name = participant.getName(); + if(name.length() > 2){ + name = name.charAt(0) + "*" + name.substring(2); + }else{ + name = name.charAt(0) + "*"; + } + worldCupRankVo.setName(name); + + } + worldCupRankVo.setOneself(1); + list.add(worldCupRankVo); + break; + } + } + } + return list; + } + + + /** + * 比赛结束后通知处理逻辑 + * @param custom 开始比赛接口上传的自定义参数 + * @param red_score 红方分数 + * @param blue 蓝方分数 + */ + @Override + public void endWorldCupCallback(String custom, Integer red_score, Integer blue) { + List<Long> ids = JSON.parseArray(custom, Long.class); + List<WorldCupCompetitor> worldCupCompetitors = this.listByIds(ids); + WorldCupCompetitor worldCupCompetitor1 = worldCupCompetitors.get(0); + WorldCup worldCup = worldCupService.getById(worldCupCompetitor1.getWorldCupId()); + for (WorldCupCompetitor worldCupCompetitor : worldCupCompetitors) { + //蓝方 + if(worldCupCompetitor.getParticipant() == 1){ + worldCupCompetitor.setMatchResult(blue.compareTo(red_score)); + worldCupCompetitor.setOurScore(blue); + worldCupCompetitor.setOpponentScore(red_score); + worldCupCompetitor.setEndTime(new Date()); + worldCupCompetitor.setWinIntegral(0); + if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && blue.compareTo(red_score) >= 0){ + worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral()); + AppUser appUser = appUserClient.getAppUser(worldCupCompetitor.getAppUserId()); + appUser.setIntegral(appUser.getIntegral() + worldCup.getWinIntegral()); + appUserClient.updateAppUser(appUser); + } + } + //红方 + if(worldCupCompetitor.getParticipant() == 2){ + worldCupCompetitor.setMatchResult(red_score.compareTo(blue)); + worldCupCompetitor.setOurScore(red_score); + worldCupCompetitor.setOpponentScore(blue); + worldCupCompetitor.setEndTime(new Date()); + worldCupCompetitor.setWinIntegral(0); + if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && red_score.compareTo(blue) >= 0){ + worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral()); + AppUser appUser = appUserClient.getAppUser(worldCupCompetitor.getAppUserId()); + appUser.setIntegral(appUser.getIntegral() + worldCup.getWinIntegral()); + appUserClient.updateAppUser(appUser); + } + } + } + + this.updateBatchById(worldCupCompetitors); + } + + + /** + * 获取比赛排行榜列表数据 + * @param worldCupRecords + * @return + */ + @Override + public Map<String, Object> worldCupRecordsList(WorldCupRecords worldCupRecords) { + Map<String, Object> map1 = new HashMap<>(); + AppUserIdsByCityName appUserIdsByCityName = new AppUserIdsByCityName(); + appUserIdsByCityName.setProvince(worldCupRecords.getProvince()); + appUserIdsByCityName.setCity(worldCupRecords.getCity()); + List<Integer> appUserIds = appUserClient.getAppUserIdsByCityName(appUserIdsByCityName); + List<Map<String, Object>> mapList = this.baseMapper.worldCupRecordsList(worldCupRecords, appUserIds); + for (int i = 0; i < mapList.size(); i++) { + Map<String, Object> map = mapList.get(i); + Integer participantType = Integer.valueOf(map.get("participantType").toString()); + Long participantId = Long.valueOf(map.get("participantId").toString()); + Integer appUserId = Integer.valueOf(map.get("appUserId").toString()); + Integer totalSession = Integer.valueOf(map.get("totalSession").toString()); + Integer win = Integer.valueOf(map.get("win").toString()); + Integer lose = totalSession - win; + map.put("lose", lose); + AppUser appUser = appUserClient.getAppUser(appUserId); + map.put("province", appUser.getProvince() + appUser.getCity()); + if(1 == participantType){ + TStudent tStudent = studentClient.queryById(participantId.intValue()); + map.put("name", tStudent.getName()); + map.put("phone", tStudent.getPhone()); + }else{ + Participant participant = participantClient.getParticipant(participantId); + map.put("name", participant.getName()); + map.put("phone", participant.getPhone()); + } + } + Integer offset = worldCupRecords.getOffset(); + Integer limit = worldCupRecords.getLimit(); + limit += offset; + map1.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size())); + int count = this.baseMapper.worldCupRecordsListCount(appUserIds); + map1.put("total", count); + return map1; + } + + + /** + * 获取比赛统计详情列表 + * @param worldCupGameStatisticsInfoList + * @return + */ + @Override + public Map<String, Object> worldCupGameStatisticsInfoList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList) { + Map<String, Object> map1 = new HashMap<>(); + Integer id = worldCupGameStatisticsInfoList.getId(); + String name = worldCupGameStatisticsInfoList.getName(); + String phone = worldCupGameStatisticsInfoList.getPhone(); + String idcard = worldCupGameStatisticsInfoList.getIdcard(); + List<Map<String, Object>> mapList = this.baseMapper.worldCupGameStatisticsInfoList(id); + List<Map<String, Object>> list = new ArrayList<>(); + for (int i = 0; i < mapList.size(); i++) { + Map<String, Object> map = mapList.get(i); + Integer participantType = Integer.valueOf(map.get("participantType").toString()); + Long participantId = Long.valueOf(map.get("participantId").toString()); + Integer appUserId = Integer.valueOf(map.get("appUserId").toString()); + Integer totalSession = Integer.valueOf(map.get("totalSession").toString()); + Integer win = Integer.valueOf(map.get("win").toString()); + Integer lose = totalSession - win; + map.put("lose", lose); + map.put("participantType", participantType); + map.put("participantId", participantId); + AppUser appUser = appUserClient.getAppUser(appUserId); + map.put("province", appUser.getProvince() + appUser.getCity()); + if(1 == participantType){ + TStudent tStudent = studentClient.queryById(participantId.intValue()); + if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){ + continue; + } + if(ToolUtil.isNotEmpty(phone) && tStudent.getPhone().indexOf(phone) == -1){ + continue; + } + if(ToolUtil.isNotEmpty(idcard) && tStudent.getIdCard().indexOf(idcard) == -1){ + continue; + } + + map.put("name", tStudent.getName()); + map.put("phone", tStudent.getPhone()); + }else{ + Participant participant = participantClient.getParticipant(participantId); + if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){ + continue; + } + if(ToolUtil.isNotEmpty(phone) && participant.getPhone().indexOf(phone) == -1){ + continue; + } + if(ToolUtil.isNotEmpty(idcard) && participant.getIdcard().indexOf(idcard) == -1){ + continue; + } + + map.put("name", participant.getName()); + map.put("phone", participant.getPhone()); + } + list.add(map); + } + map1.put("total", mapList.size()); + Integer offset = worldCupGameStatisticsInfoList.getOffset(); + Integer limit = worldCupGameStatisticsInfoList.getLimit(); + limit += offset; + map1.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size())); + return map1; + } + + + /** + * 获取单场参赛详情列表 + * @return + */ + @Override + public Map<String, Object> worldCupGameStatisticsListInfo(WorldCupGameStatisticsListInfo worldCupGameStatisticsListInfo) { + Long id = worldCupGameStatisticsListInfo.getId(); + String name = worldCupGameStatisticsListInfo.getName(); + WorldCupCompetitor worldCupCompetitor = this.getById(id); + List<WorldCupCompetitor> list = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode())); + List<Map<String, Object>> mapList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy.HH.dd HH:mm"); + for (WorldCupCompetitor cupCompetitor : list) { + Map<String, Object> map = new HashMap<>(); + map.put("id", cupCompetitor.getId()); + Integer participantType = cupCompetitor.getParticipantType(); + Long participantId = cupCompetitor.getParticipantId(); + if(1 == participantType){ + TStudent tStudent = studentClient.queryById(participantId.intValue()); + if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){ + continue; + } + + map.put("name", tStudent.getName()); + }else{ + Participant participant = participantClient.getParticipant(participantId); + if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){ + continue; + } + map.put("name", participant.getName()); + } + map.put("startTime", sdf.format(cupCompetitor.getStartTime())); + map.put("score", cupCompetitor.getOurScore().compareTo(cupCompetitor.getOpponentScore()) > 0 ? + cupCompetitor.getOurScore() + ":" + cupCompetitor.getOpponentScore() : + cupCompetitor.getOpponentScore() + ":" + cupCompetitor.getOurScore()); + map.put("matchResult", cupCompetitor.getMatchResult() == 1 ? "胜" : "负"); + mapList.add(map); + } + Map<String, Object> map = new HashMap<>(); + map.put("rows", mapList); + map.put("total", mapList.size()); + return map; + } + + + /** + * 修改比分 + * @param changeScore + */ + @Override + public void changeScore(ChangeScore changeScore) { + Long id = changeScore.getId(); + Integer blue = changeScore.getBlue(); + Integer red = changeScore.getRed(); + WorldCupCompetitor worldCupCompetitor = this.getById(id); + List<WorldCupCompetitor> blueList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode()).eq("participant", 1)); + WorldCup worldCup = worldCupService.getById(blueList.get(0).getWorldCupId()); + for (WorldCupCompetitor cupCompetitor : blueList) { + //如果之前输了,现在赢了,需要增加积分 + if(cupCompetitor.getMatchResult() == -1 && blue.compareTo(red) > 0){ + AppUser appUser = appUserClient.getAppUser(cupCompetitor.getAppUserId()); + appUser.setIntegral(appUser.getIntegral() + worldCup.getWinIntegral()); + appUserClient.updateAppUser(appUser); + + cupCompetitor.setMatchResult(1); + cupCompetitor.setWinIntegral(worldCup.getWinIntegral()); + } + //如果之前赢了,现在输了,需要扣减积分 + if(cupCompetitor.getMatchResult() == 1 && blue.compareTo(red) < 0){ + AppUser appUser = appUserClient.getAppUser(cupCompetitor.getAppUserId()); + appUser.setIntegral(appUser.getIntegral() - worldCup.getWinIntegral()); + appUserClient.updateAppUser(appUser); + + cupCompetitor.setMatchResult(-1); + cupCompetitor.setWinIntegral(0); + } + cupCompetitor.setOurScore(blue); + cupCompetitor.setOpponentScore(red); + } + this.updateBatchById(blueList); + + List<WorldCupCompetitor> redList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode()).eq("participant", 2)); + for (WorldCupCompetitor cupCompetitor : redList) { + //如果之前输了,现在赢了,需要增加积分 + if(cupCompetitor.getMatchResult() == -1 && red.compareTo(blue) > 0){ + AppUser appUser = appUserClient.getAppUser(cupCompetitor.getAppUserId()); + appUser.setIntegral(appUser.getIntegral() + worldCup.getWinIntegral()); + appUserClient.updateAppUser(appUser); + + cupCompetitor.setMatchResult(1); + cupCompetitor.setWinIntegral(worldCup.getWinIntegral()); + } + //如果之前赢了,现在输了,需要扣减积分 + if(cupCompetitor.getMatchResult() == 1 && red.compareTo(blue) < 0){ + AppUser appUser = appUserClient.getAppUser(cupCompetitor.getAppUserId()); + appUser.setIntegral(appUser.getIntegral() - worldCup.getWinIntegral()); + appUserClient.updateAppUser(appUser); + + cupCompetitor.setMatchResult(-1); + cupCompetitor.setWinIntegral(0); + } + cupCompetitor.setOurScore(red); + cupCompetitor.setOpponentScore(blue); + } + this.updateBatchById(blueList); + } + + + /** + * 获取用户比赛记录详情 + * @param userGameRecordList + * @return + */ + @Override + public Map<String, Object> userGameRecordList(UserGameRecordList userGameRecordList) { + String name = userGameRecordList.getUserName(); + List<Map<String, Object>> list = this.baseMapper.userGameRecordList(userGameRecordList.getName()); + List<Map<String, Object>> mapList = new ArrayList<>(); + for (Map<String, Object> map : list) { + Long participantType = Long.valueOf(map.get("participantType").toString()); + Long participantId = Long.valueOf(map.get("participantId").toString()); + Integer ourScore = Integer.valueOf(map.get("ourScore").toString()); + Integer opponentScore = Integer.valueOf(map.get("opponentScore").toString()); + Integer matchResult = Integer.valueOf(map.get("matchResult").toString()); + if(1 == participantType){ + TStudent tStudent = studentClient.queryById(participantId.intValue()); + if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){ + continue; + } + map.put("userName", tStudent.getName()); + }else{ + Participant participant = participantClient.getParticipant(participantId); + if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){ + continue; + } + map.put("userName", participant.getName()); + } + map.put("score", ourScore.compareTo(opponentScore) > 0 ? + ourScore + ":" + opponentScore : + opponentScore + ":" + ourScore); + map.put("matchResult", matchResult == 1 ? "胜" : "负"); + mapList.add(map); + } + Map<String, Object> map = new HashMap<>(); + map.put("total", mapList.size()); + Integer offset = userGameRecordList.getOffset(); + Integer limit = userGameRecordList.getLimit(); + limit += offset; + map.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size())); + return map; + } } -- Gitblit v1.7.1