From 48f8fffb3df2d8fd77c0a52df0e56e04eb5931ae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 02 三月 2024 10:03:22 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 2 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 076f753..1ee364e 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.communityWorldCup.entity.WorldCup;
+import com.dsh.communityWorldCup.entity.WorldCupCompetitor;
import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant;
import com.dsh.communityWorldCup.entity.WorldCupStore;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
@@ -17,6 +18,7 @@
import com.dsh.communityWorldCup.feignclient.other.model.Site;
import com.dsh.communityWorldCup.feignclient.other.model.Store;
import com.dsh.communityWorldCup.model.*;
+import com.dsh.communityWorldCup.service.IWorldCupCompetitorService;
import com.dsh.communityWorldCup.service.IWorldCupPaymentParticipantService;
import com.dsh.communityWorldCup.service.IWorldCupService;
import com.dsh.communityWorldCup.service.IWorldCupStoreService;
@@ -83,6 +85,9 @@
@Autowired
private IWorldCupStoreService worldCupStoreService;
+
+ @Autowired
+ private IWorldCupCompetitorService worldCupCompetitorService;
@@ -259,10 +264,12 @@
@ApiOperation(value = "获取世界杯详情【2.0】", tags = {"APP-社区世界杯"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "世界杯id", required = true, dataType = "int"),
+ @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<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id){
- WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id);
+ public ResultUtil<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id, @RequestBody String lon, @RequestBody String lat){
+ WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id, lon, lat);
return ResultUtil.success(worldCupInfo);
}
@@ -384,4 +391,121 @@
List<Integer> collect = worldCupList.stream().map(WorldCup::getId).collect(Collectors.toList());
return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect));
}
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getEntrantRank")
+ @ApiOperation(value = "获取世界杯排名【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @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);
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getMyWorldCupList")
+ @ApiOperation(value = "获取报名的世界杯列表【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<WorldCupListVo>> getMyWorldCupList(MyWorldCupList myWorldCupList){
+ List<WorldCupListVo> myWorldCupList1 = worldCupPaymentParticipantService.getMyWorldCupList(myWorldCupList);
+ return ResultUtil.success(myWorldCupList1);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getParticipant")
+ @ApiOperation(value = "获取已报名的参赛人员【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<ParticipantVo>> getParticipant(){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ List<ParticipantVo> participant = worldCupPaymentParticipantService.getParticipant(uid);
+ return ResultUtil.success(participant);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getMyWorldCupInfo")
+ @ApiOperation(value = "获取已报名世界杯详情【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "列表中的id", 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);
+ return ResultUtil.success(myWorldCupInfo);
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getWorldCupMatchRecord")
+ @ApiOperation(value = "获取比赛记录【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<MatchRecordVo> getWorldCupMatchRecord(MatchRecord matchRecord){
+ MatchRecordVo matchRecord1 = worldCupCompetitorService.getMatchRecord(matchRecord);
+ return ResultUtil.success(matchRecord1);
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getWorldCupRank")
+ @ApiOperation(value = "获取比赛排名【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<WorldCupRankVo>> getWorldCupRank(WorldCupRank worldCupRank){
+ List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
+ return ResultUtil.success(worldCupRank1);
+ }
+
+
+ /**
+ * 获取学员参与数量
+ * @param studentId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/count")
+ public Integer count(@RequestBody Integer studentId){
+ return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
+ .eq("participantId", studentId).eq("participantType", 1));
+ }
+
+
+ /**
+ * 获取学员世界杯胜利次数
+ * @param studentId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/winCount")
+ public Integer winCount(@RequestBody Integer studentId){
+ return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
+ .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1));
+ }
}
--
Gitblit v1.7.1