From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 d21a8ce..2cf0dda 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
@@ -184,7 +184,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(String code){
+ public ResultUtil<Map<String, String>> getDeviceInformation(@RequestBody String code){
/**
* {
* "scan_type": 0, // 扫码类型：1000：游戏，1001:课程，1002:场地
@@ -264,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(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,7 +386,7 @@
* @return
*/
@PostMapping("/worldCup/getWorldCupStoreList")
- public List<WorldCupStore> getWorldCupStoreList(Integer storeId){
+ public List<WorldCupStore> getWorldCupStoreList(@RequestBody Integer storeId){
List<WorldCup> worldCupList = worldCupService.list(new QueryWrapper<WorldCup>().in("status", Arrays.asList(1, 2)));
List<Integer> collect = worldCupList.stream().map(WorldCup::getId).collect(Collectors.toList());
return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect));
@@ -502,8 +504,20 @@
*/
@ResponseBody
@PostMapping("/worldCup/winCount")
- public Integer winCount(Integer studentId){
+ public Integer winCount(@RequestBody Integer studentId){
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);
+ }
}
--
Gitblit v1.7.1