From eadc1f646e81e8ffbe940b13163aee9d107d6663 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 13 三月 2024 09:03:32 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
index 57812c9..fdb397d 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
@@ -43,10 +43,19 @@
@Autowired
private TokenUtil tokenUtil;
+ @Resource
+ private StudentClient studentClient;
+
+ @Autowired
+ private UserCompetitionService userCompetitionService;
+
+
+
+
@ResponseBody
@PostMapping("/api/participant/addParticipant")
- @ApiOperation(value = "添加参赛人员", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "添加参赛人员【2.0】", tags = {"APP-赛事活动列表", "人员管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -66,7 +75,7 @@
@ResponseBody
@PostMapping("/api/participant/queryParticipantList")
- @ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", "我的二维码", "人员管理", "APP-社区世界杯"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "isPre(1过滤)", name = "是否过滤未实名", required = true, dataType = "int")
@@ -97,15 +106,11 @@
}
- @Resource
- private StudentClient studentClient;
- @Resource
- private AppUserClient appUserClient;
@ResponseBody
@PostMapping("/api/participant/editParticipant")
- @ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", "人员管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -160,17 +165,17 @@
@ResponseBody
@PostMapping("/api/participant/delParticipant")
- @ApiOperation(value = "删除参赛人员", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "删除参赛人员", tags = {"APP-赛事活动列表", "人员管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil delParticipant(Integer id) {
+ public ResultUtil delParticipant(Integer id, Integer isStudent) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
}
- return participantService.delParticipant(id);
+ return participantService.delParticipant(id, isStudent);
} catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
@@ -193,8 +198,7 @@
}
}
- @Autowired
- private UserCompetitionService userCompetitionService;
+
@ResponseBody
@@ -202,4 +206,11 @@
public Integer counts(@RequestBody Integer stuId) {
return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId", stuId));
}
+
+
+ @ResponseBody
+ @PostMapping("/participant/getParticipant")
+ public Participant getParticipant(@RequestBody Long id){
+ return participantService.getById(id);
+ }
}
--
Gitblit v1.7.1