From ab20715db09a5e4888c19702f5f73ecdc4e55f15 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 06 三月 2024 11:38:55 +0800 Subject: [PATCH] 添加方法 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java index 19e0f8b..cb1b7b0 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java @@ -186,7 +186,7 @@ @ApiImplicitParam(name = "code", value = "扫码结果", required = true, dataType = "String"), @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<Map<String, String>> getDeviceInformation(@RequestBody String code){ + public ResultUtil<Map<String, String>> getDeviceInformation(String code){ /** * { * "scan_type": 0, // 扫码类型:1000:游戏,1001:课程,1002:场地 @@ -270,7 +270,7 @@ @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "string"), @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id, @RequestBody String lon, @RequestBody String lat){ + public ResultUtil<WorldCupInfo> getWorldCupInfo(Integer id,String lon, String lat){ WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id, lon, lat); return ResultUtil.success(worldCupInfo); } @@ -404,8 +404,18 @@ @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<EntrantRankVo> getEntrantRank(EntrantRank entrantRank){ - EntrantRankVo entrantRank1 = worldCupCompetitorService.getEntrantRank(entrantRank); - return ResultUtil.success(entrantRank1); + try { + Integer uid = tokenUtil.getUserIdFormRedis(); + if(null == uid){ + return ResultUtil.success(); + } + entrantRank.setAppUserId(uid); + EntrantRankVo entrantRank1 = worldCupCompetitorService.getEntrantRank(entrantRank); + return ResultUtil.success(entrantRank1); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } } @@ -451,10 +461,12 @@ @ApiOperation(value = "获取已报名世界杯详情【2.0】", tags = {"APP-个人中心"}) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"), + @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "string"), + @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "string"), @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(String id){ - MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id); + public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(String id, String lon, String lat){ + MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id, lon, lat); return ResultUtil.success(myWorldCupInfo); } @@ -510,6 +522,18 @@ return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>() .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1)); } + + /** + * 获取比赛管理列表数据 + * @param worldCupListAll + * @return + */ + @ResponseBody + @PostMapping("/worldCup/getWorldCupListAll") + public Map<String, Object> getWorldCupListAll(@RequestBody WorldCupListAll worldCupListAll){ + return worldCupService.getWorldCupListAll(worldCupListAll); + } + /** @@ -633,8 +657,8 @@ */ @ResponseBody @PostMapping("/base/worldCup/endWorldCupCallback") - public void endWorldCupCallback(){ - + public void endWorldCupCallback(String custom, Integer red_score, Integer blue){ + worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue); } @@ -667,4 +691,16 @@ out.close(); } } + + + /** + * 获取已报名人员列表 + * @param registeredPersonnel + * @return + */ + @ResponseBody + @PostMapping("/worldCup/getRegisteredPersonnel") + public Map<String, Object> getRegisteredPersonnel(@RequestBody RegisteredPersonnel registeredPersonnel){ + return worldCupPaymentParticipantService.getRegisteredPersonnel(registeredPersonnel); + } } -- Gitblit v1.7.1