cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -109,6 +109,16 @@ detail.setConsumeName("社区世界杯调整比分"); detail.setDetailsType(1); break; case 9: detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral())); detail.setConsumeName("社区世界杯平场"); detail.setDetailsType(2); break; case 10: detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral())); detail.setConsumeName("社区世界杯败场"); detail.setDetailsType(2); break; default: break; } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -275,6 +275,16 @@ if(0 == isStudent){ isStudent = 2; } WorldCup worldCup = worldCupService.getById(worldCupPeople.getWorldCupId()); if(null == worldCup){ return ResultUtil.error("当前比赛不存在"); } if(worldCup.getStartTime().getTime()>System.currentTimeMillis() || worldCup.getEndTime().getTime()<System.currentTimeMillis()){ return ResultUtil.error("二维码仅支持在赛事有效期使用"); } WorldCupPaymentParticipant worldCupPaymentParticipant = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>() .eq("worldCupId", worldCupPeople.getWorldCupId()).eq("participantId", id).eq("participantType", isStudent) .orderByDesc("createTime").last(" limit 0, 1")); @@ -351,6 +361,15 @@ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil startWorldCup(StartWorldCup startWorldCup){ return worldCupService.startWorldCup(startWorldCup); } @ResponseBody @PostMapping("/api/worldCup/endWorldCup") @ApiOperation(value = "裁判结束比赛【3.1】", tags = {"APP-个人中心"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil endWorldCup(StartWorldCup startWorldCup){ return worldCupService.startWorldCup(startWorldCup); } @@ -694,6 +713,26 @@ } } @ResponseBody @PostMapping("/api/worldCup/getWorldCupListFromRank") @ApiOperation(value = "获取报名的赛事 排名使用【3.1】", tags = {"APP-个人中心"}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<List<WorldCupListVo>> getWorldCupListFromRank(){ try { Integer uid = tokenUtil.getUserIdFormRedis(); if(null == uid){ return ResultUtil.tokenErr(); } List<WorldCupListVo> worldCupRank1 = worldCupCompetitorService.getWorldCupListFromRank(uid); return ResultUtil.success(worldCupRank1); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); } } /** * 获取学员参与数量 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java
@@ -76,6 +76,16 @@ @TableField("winIntegral") private Integer winIntegral; /** * 平场奖励 */ @TableField("drawIntegral") private Integer drawIntegral; /** * 败场奖励 */ @TableField("loseIntegral") private Integer loseIntegral; /** * 比赛开始时间 */ @TableField("startTime") cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/model/SaveUserIntegralChangesVo.java
@@ -13,7 +13,7 @@ */ private Integer appUserId; /** * 积分类型（1=赠送积分，2=兑换商品，3=完成课后练习，4=观看教学视频，5=参与世界杯，6=世界杯获胜） * 积分类型（1=赠送积分，2=兑换商品，3=完成课后练习，4=观看教学视频，5=参与世界杯，6=世界杯获胜 9平场世界杯 10败场世界杯） */ private Integer type; /** cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupCompetitorMapper.java
@@ -35,10 +35,10 @@ * @param worldCupRank * @return */ List<Map<String, Object>> getWorldCupRank(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds); List<Map<String, Object>> getWorldCupRank(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime); List<Map<String, Object>> getWorldCupRank1(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds); List<Map<String, Object>> getWorldCupRank1(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime); /** @@ -46,14 +46,14 @@ * @param worldCupRecords * @return */ List<Map<String, Object>> worldCupRecordsList(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds); List<Map<String, Object>> worldCupRecordsList(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime); /** * 获取比赛排行榜列表数据 * @param worldCupRecords * @return */ List<Map<String, Object>> worldCupRecordsList1(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds); List<Map<String, Object>> worldCupRecordsList1(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime); int worldCupRecordsListCount(@Param("appUserIds") List<Integer> appUserIds); @@ -87,4 +87,8 @@ * @return */ int getMatchTime(@Param("worldCupId") Integer worldCupId); List<WorldCupListVo> getWorldCupListFromRank(@Param("uid") Integer uid); } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/EndWorldCup.java
New file @@ -0,0 +1,20 @@ package com.dsh.communityWorldCup.model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author zhibing.pu * @Date 2024/2/19 15:24 */ @Data @ApiModel public class EndWorldCup { @ApiModelProperty(value = "世界杯id", required = true, dataType = "int") private Integer worldCupId; @ApiModelProperty(value = "结果", required = true, dataType = "String") private String result; } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupInfo.java
@@ -50,6 +50,10 @@ private String intro; @ApiModelProperty("富文本") private String content; @ApiModelProperty("参赛协议") private String contentOne; @ApiModelProperty("1or null智慧赛事 2非智慧赛事") private Integer type; @ApiModelProperty("门店信息") private List<Map<String, Object>> storeInfos; } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupRank.java
@@ -21,5 +21,12 @@ private Integer radius; @ApiModelProperty(value = "排序，1=场次，2=胜率", required = true, dataType = "int") private Integer sort; @ApiModelProperty("赛事id") private Integer worldCupId; @ApiModelProperty("季度时间2020-01-01 - 2022-03-31") private String time; private Integer appUserId; } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupRankVo.java
@@ -21,6 +21,8 @@ private Integer totalSession; @ApiModelProperty("胜率") private Double winRate; @ApiModelProperty("积分") private Integer integral; @ApiModelProperty("是否是自己（0=否，1=是）") private Integer oneself; } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupRecords.java
@@ -16,6 +16,11 @@ * 市名称 */ private String city; /** * 时间 */ private String time; /** * 页码 */ cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupCompetitorService.java
@@ -92,4 +92,7 @@ * @return */ int getMatchTime(Integer worldCupId); List<WorldCupListVo> getWorldCupListFromRank(Integer uid); } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -30,6 +30,7 @@ import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; /** * @author zhibing.pu @@ -168,10 +169,19 @@ AppUser appUser = appUserClient.getAppUser(worldCupRank.getAppUserId()); appUserIds = appUserClient.getAppUserIds(appUser.getCityCode()); } String sTime = null; String eTime = null; if(ToolUtil.isNotEmpty(worldCupRank.getTime())){ sTime = worldCupRank.getTime().split(" - ")[0] + " 00:00:00"; eTime = worldCupRank.getTime().split(" - ")[1] + " 23:59:59"; } //总场次 List<Map<String, Object>> lists = this.baseMapper.getWorldCupRank(worldCupRank, appUserIds); List<Map<String, Object>> lists = this.baseMapper.getWorldCupRank(worldCupRank, appUserIds, sTime, eTime); //未负的数据 List<Map<String, Object>> lists1 = this.baseMapper.getWorldCupRank1(worldCupRank, appUserIds); List<Map<String, Object>> lists1 = this.baseMapper.getWorldCupRank1(worldCupRank, appUserIds, sTime, eTime); List<Map<String, Object>> mapList = new ArrayList<>(); for (int i = 0; i < lists.size(); i++) { Map<String, Object> map = lists.get(i); @@ -179,6 +189,9 @@ Long participantId = Long.valueOf(map.get("participantId").toString()); Integer appUserId = Integer.valueOf(map.get("appUserId").toString()); Integer num = Integer.valueOf(null == map.get("num") ? "0" : map.get("num").toString()); Integer winIntegral = Integer.valueOf(null == map.get("winIntegral") ? "0" : map.get("winIntegral").toString()); Integer drawIntegral = Integer.valueOf(null == map.get("drawIntegral") ? "0" : map.get("drawIntegral").toString()); Integer loseIntegral = Integer.valueOf(null == map.get("loseIntegral") ? "0" : map.get("loseIntegral").toString()); //学员 if(participantType == 1){ TStudent tStudent = studentClient.queryById(participantId.intValue()); @@ -194,6 +207,7 @@ } } map.put("totalSession", num); map.put("totalIntegral", winIntegral+drawIntegral+loseIntegral); map.put("winRate", "0"); for (Map<String, Object> objectMap : lists1) { Integer participantType1 = Integer.valueOf(objectMap.get("participantType").toString()); @@ -207,22 +221,30 @@ } mapList.add(map); } if(worldCupRank.getSort() == 1){ mapList.sort(new Comparator<Map<String, Object>>() { @Override public int compare(Map<String, Object> o1, Map<String, Object> o2) { return Double.valueOf(o1.get("totalSession").toString()).compareTo(Double.valueOf(o2.get("totalSession").toString())) * -1; } }); } if(worldCupRank.getSort() == 2){ mapList.sort(new Comparator<Map<String, Object>>() { @Override public int compare(Map<String, Object> o1, Map<String, Object> o2) { return Double.valueOf(o1.get("winRate").toString()).compareTo(Double.valueOf(o2.get("winRate").toString())) * -1; } }); } // if(worldCupRank.getSort() == 1){ // mapList.sort(new Comparator<Map<String, Object>>() { // @Override // public int compare(Map<String, Object> o1, Map<String, Object> o2) { // return Double.valueOf(o1.get("totalSession").toString()).compareTo(Double.valueOf(o2.get("totalSession").toString())) * -1; // } // }); // } // if(worldCupRank.getSort() == 2){ // mapList.sort(new Comparator<Map<String, Object>>() { // @Override // public int compare(Map<String, Object> o1, Map<String, Object> o2) { // return Double.valueOf(o1.get("winRate").toString()).compareTo(Double.valueOf(o2.get("winRate").toString())) * -1; // } // }); // } List<WorldCupRankVo> list = new ArrayList<>(); for (int i = 0; i < mapList.size(); i++) { Map<String, Object> map = mapList.get(i); @@ -230,12 +252,14 @@ 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 totalIntegral = Integer.valueOf(map.get("totalIntegral").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.setIntegral(totalIntegral); worldCupRankVo.setTotalSession(totalSession); worldCupRankVo.setWinRate(winRate); //学员 @@ -314,6 +338,8 @@ } } } // 排序 list= list.stream().sorted(Comparator.comparing(WorldCupRankVo::getIntegral).reversed().thenComparing(WorldCupRankVo::getTotalSession).reversed().thenComparing(WorldCupRankVo::getWinRate).reversed()).collect(Collectors.toList()); return list; } @@ -346,13 +372,31 @@ worldCupCompetitor.setOpponentScore(red_score); worldCupCompetitor.setEndTime(new Date()); worldCupCompetitor.setWinIntegral(0); if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && blue_score.compareTo(red_score) >= 0){ worldCupCompetitor.setDrawIntegral(0); worldCupCompetitor.setLoseIntegral(0); if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && blue_score.compareTo(red_score) > 0){ worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); vo.setAppUserId(worldCupCompetitor.getAppUserId()); vo.setIntegral(worldCup.getWinIntegral()); vo.setType(7); userIntegralChangesClient.saveUserIntegralChanges(vo); }else if(null != worldCup.getDrawIntegral() && 0 < worldCup.getDrawIntegral() && blue_score.compareTo(red_score) == 0){ worldCupCompetitor.setDrawIntegral(worldCup.getDrawIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); vo.setAppUserId(worldCupCompetitor.getAppUserId()); vo.setIntegral(worldCup.getDrawIntegral()); vo.setType(9); userIntegralChangesClient.saveUserIntegralChanges(vo); }else if(null != worldCup.getLoseIntegral() && 0 < worldCup.getLoseIntegral() && blue_score.compareTo(red_score) < 0){ worldCupCompetitor.setDrawIntegral(worldCup.getLoseIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); vo.setAppUserId(worldCupCompetitor.getAppUserId()); vo.setIntegral(worldCup.getLoseIntegral()); vo.setType(10); userIntegralChangesClient.saveUserIntegralChanges(vo); } } @@ -363,13 +407,31 @@ worldCupCompetitor.setOpponentScore(blue_score); worldCupCompetitor.setEndTime(new Date()); worldCupCompetitor.setWinIntegral(0); if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && red_score.compareTo(blue_score) >= 0){ worldCupCompetitor.setDrawIntegral(0); worldCupCompetitor.setLoseIntegral(0); if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && red_score.compareTo(blue_score) > 0){ worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); vo.setAppUserId(worldCupCompetitor.getAppUserId()); vo.setIntegral(worldCup.getWinIntegral()); vo.setType(7); userIntegralChangesClient.saveUserIntegralChanges(vo); }else if(null != worldCup.getDrawIntegral() && 0 < worldCup.getDrawIntegral() && blue_score.compareTo(red_score) == 0){ worldCupCompetitor.setDrawIntegral(worldCup.getDrawIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); vo.setAppUserId(worldCupCompetitor.getAppUserId()); vo.setIntegral(worldCup.getDrawIntegral()); vo.setType(9); userIntegralChangesClient.saveUserIntegralChanges(vo); }else if(null != worldCup.getLoseIntegral() && 0 < worldCup.getLoseIntegral() && blue_score.compareTo(red_score) < 0){ worldCupCompetitor.setDrawIntegral(worldCup.getLoseIntegral()); //增加积分明细 SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo(); vo.setAppUserId(worldCupCompetitor.getAppUserId()); vo.setIntegral(worldCup.getLoseIntegral()); vo.setType(10); userIntegralChangesClient.saveUserIntegralChanges(vo); } } @@ -416,8 +478,15 @@ appUserIdsByCityName.setProvince(worldCupRecords.getProvince()); appUserIdsByCityName.setCity(worldCupRecords.getCity()); List<Integer> appUserIds = appUserClient.getAppUserIdsByCityName(appUserIdsByCityName); List<Map<String, Object>> mapList = this.baseMapper.worldCupRecordsList(worldCupRecords, appUserIds); List<Map<String, Object>> mapList1 = this.baseMapper.worldCupRecordsList1(worldCupRecords, appUserIds); String time = worldCupRecords.getTime(); String sTime = null; String eTime = null; if(ToolUtil.isNotEmpty(time)){ sTime = time.split(" - ")[0] + " 00:00:00"; eTime = time.split(" - ")[1] + " 23:59:59"; } List<Map<String, Object>> mapList = this.baseMapper.worldCupRecordsList(worldCupRecords, appUserIds,sTime,eTime); List<Map<String, Object>> mapList1 = this.baseMapper.worldCupRecordsList1(worldCupRecords, appUserIds,sTime,eTime); List<Map<String, Object>> list = new ArrayList<>(); int row_num = 0; for (int i = 0; i < mapList.size(); i++) { @@ -787,4 +856,10 @@ public int getMatchTime(Integer worldCupId) { return this.baseMapper.getMatchTime(worldCupId); } @Override public List<WorldCupListVo> getWorldCupListFromRank(Integer uid) { return this.baseMapper.getWorldCupListFromRank(uid); } } cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -81,9 +81,6 @@ private UserIntegralChangesClient userIntegralChangesClient; /** * 裁判获取世界杯列表数据 * @return @@ -131,18 +128,43 @@ return ResultUtil.error("赛事已取消"); } //1、通过扫码获取的sutuid查询t_game表中的红蓝方sutuid // 智慧需要判断code String code = startWorldCup.getCode(); JSONObject object = JSON.parseObject(code); String sutu_id = object.getString("sutu_id"); TGame tGame = gameClient.getTGameBySutuId(sutu_id); if (worldCup.getType() == null || worldCup.getType() == 1) { if(null == tGame){ return ResultUtil.error("无效的游戏二维码"); } } String people = startWorldCup.getPeople(); JSONArray jsonArray = JSON.parseArray(people); if(jsonArray.size() != 6){ return ResultUtil.error("参赛人数只能是6人"); int red=0; int blue=0; for (Object o : jsonArray) { JSONObject jsonObject = JSONObject.parseObject(o.toString()); String type = jsonObject.get("type").toString(); if("red".equals( type)){ red++; } if("blue".equals( type)){ blue++; } } if(red==0){ return ResultUtil.error("红方最少要1人参赛"); } if(red>5){ return ResultUtil.error("红方最多5人参赛"); } if(blue==0){ return ResultUtil.error("蓝方最少要1人参赛"); } if(blue>5){ return ResultUtil.error("蓝方最多5人参赛"); } String timeStr = UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3); List<Long> ids = new ArrayList<>(); @@ -183,10 +205,13 @@ worldCup.setMatchNumber(worldCup.getMatchNumber() + 1); this.updateById(worldCup); //2、调起开启游戏的接口。 JSONObject jsonObject = new JSONObject(); jsonObject.put("gameType", 1); jsonObject.put("ids", ids); //2、调起开启游戏的接口。 if (worldCup.getType() == null || worldCup.getType() == 1) { HashMap<String, String> map = new HashMap<>(); map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B"); map.put("space_id", tGame.getSiteId() + ""); @@ -200,9 +225,12 @@ Integer code1 = jsonObject1.getInteger("code"); String message = jsonObject1.getString("message"); if (200 == code1) { return ResultUtil.success(); return ResultUtil.success(jsonObject.toJSONString()); } else { return ResultUtil.error(message); } }else { return ResultUtil.success(jsonObject.toJSONString()); } } @@ -415,9 +443,6 @@ } /** * 报名世界杯 * @param paymentWorldCup @@ -564,7 +589,6 @@ ,"/base/worldCup/wxPayWorldCupCallback1",worldCupPayment.getAmount().toString()); } } } cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml
@@ -110,11 +110,22 @@ participantType, participantId, appUserId, count(*) as num count(*) as num, winIntegral, drawIntegral, loseIntegral from t_world_cup_competitor where matchResult is not null <if test="null != item.year"> and DATE_FORMAT(startTime, '%Y') = #{item.year} </if> <if test="null != sTime and null != eTime"> and startTime between #{sTime} and #{eTime} </if> <if test="null != item.worldCupId"> and worldCupId =#{item.worldCupId} </if> <if test="null != appUserIds and appUserIds.size() > 0"> and appUserId in @@ -136,6 +147,12 @@ where matchResult is not null and matchResult != -1 <if test="null != item.year"> and DATE_FORMAT(startTime, '%Y') = #{item.year} </if> <if test="null != sTime and null != eTime"> and startTime between #{sTime} and #{eTime} </if> <if test="null != item.worldCupId"> and worldCupId =#{item.worldCupId} </if> <if test="null != appUserIds and appUserIds.size() > 0"> and appUserId in @@ -162,6 +179,9 @@ #{iten} </foreach> </if> <if test="sTime != null and eTime != null"> and startTime between #{sTime} and #{eTime} </if> group by participantType, participantId, appUserId </select> @@ -178,6 +198,9 @@ <foreach collection="appUserIds" item="iten" index="index" open="(" separator="," close=")"> #{iten} </foreach> </if> <if test="sTime != null and eTime != null"> and startTime between #{sTime} and #{eTime} </if> group by participantType, participantId, appUserId </select> @@ -311,4 +334,17 @@ <select id="getMatchTime" resultType="int"> select count(*) as matchTime from (select code from t_world_cup_competitor where worldCupId = #{worldCupId} group by code) as b </select> <select id="getWorldCupListFromRank" resultType="com.dsh.communityWorldCup.model.WorldCupListVo"> select c.id, b.worldCupId, c.name from t_world_cup_payment_participant a left join t_world_cup_payment b on (a.worldCupPaymentId = b.id) left join t_world_cup c on (b.worldCupId = c.id) where a.appUserId = #{uid} and b.payStatus = 2 and b.refundTime is null and b.state = 1 </select> </mapper> cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml
@@ -69,7 +69,8 @@ a.paiCoin, a.classHour, a.intro, a.content a.content, a.contentOne from t_world_cup a where a.id = #{id} </select> cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupRecords.java
@@ -17,6 +17,10 @@ */ private String city; /** * 时间 */ private String time; /** * 页码 */ private Integer offset; cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
@@ -46,6 +46,12 @@ model.addAttribute("id", id); return PREFIX + "worldCupGameStatisticsInfo.html"; } @RequestMapping("/addWorldCupGameStatisticsInfo") public String addWorldCupGameStatisticsInfo(Model model, Integer id){ WorldCup worldCupById = worldCupClient.getWorldCupById(id); model.addAttribute("item", worldCupById); return PREFIX + "worldCupGameStatisticsInfo.html"; } @RequestMapping("/openWorldCupGameStatisticsListInfo")
