From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 65 ++++++++++++++------------------
1 files changed, 29 insertions(+), 36 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 2494018..57812c9 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
@@ -44,28 +44,24 @@
private TokenUtil tokenUtil;
-
-
@ResponseBody
@PostMapping("/api/participant/addParticipant")
@ApiOperation(value = "添加参赛人员", tags = {"APP-赛事活动列表", ""})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil addParticipant(AddParticipant addParticipant){
+ public ResultUtil addParticipant(AddParticipant addParticipant) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
return participantService.addParticipant(uid, addParticipant);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
@ResponseBody
@@ -75,14 +71,14 @@
@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")
})
- public ResultUtil<List<ParticipantVo>> queryParticipantList(Integer isPre){
+ public ResultUtil<List<ParticipantVo>> queryParticipantList(Integer isPre) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
List<ParticipantVo> participantVos = participantService.queryParticipantList(uid);
- if (isPre!=null){
+ if (isPre != null) {
List<ParticipantVo> filteredParticipants = new ArrayList<>();
for (ParticipantVo participant : participantVos) {
@@ -90,65 +86,62 @@
filteredParticipants.add(participant);
}
}
- return ResultUtil.success(filteredParticipants);
+ return ResultUtil.success(filteredParticipants);
}
return ResultUtil.success(participantVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
- @Resource
- private StudentClient studentClient;
+ @Resource
+ private StudentClient studentClient;
@Resource
private AppUserClient appUserClient;
+
@ResponseBody
@PostMapping("/api/participant/editParticipant")
@ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", ""})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil editParticipant(EditParticipant editParticipant){
+ public ResultUtil editParticipant(EditParticipant editParticipant) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
int numDigits = String.valueOf(editParticipant.getId()).length();
-
- if (numDigits==9){
+ if (numDigits == 9) {
Participant byId = participantService.getById(editParticipant.getId());
editParticipant.setName(byId.getName());
return participantService.editParticipant(uid, editParticipant);
- }
- else {
+ } else {
TStudent student = new TStudent();
student.setId(editParticipant.getId());
- TStudent student1 = studentClient.queryById(editParticipant.getId());
+ TStudent student1 = studentClient.queryById(editParticipant.getId());
student.setName(student1.getName());
student.setIdCard(editParticipant.getIdcard());
- if (editParticipant.getHeight()!=null) {
+ if (editParticipant.getHeight() != null) {
student.setHeight(Double.valueOf(editParticipant.getHeight()));
}
- if (editParticipant.getWeight()!=null) {
+ if (editParticipant.getWeight() != null) {
student.setWeight(editParticipant.getWeight());
}
- if(ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())){
+ if (ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) {
Boolean aBoolean = JuHeUtil.idcardAuthentication(student.getIdCard(), student.getName());
- if(!aBoolean){
+ if (!aBoolean) {
return ResultUtil.error("身份证和姓名不匹配");
}
}
@@ -158,12 +151,11 @@
studentClient.updateAppUser(student);
return ResultUtil.success();
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -172,14 +164,14 @@
@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) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
return participantService.delParticipant(id);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -188,14 +180,15 @@
/**
* 保存学员后同步参赛人员信息
+ *
* @param saveParticipant
*/
@ResponseBody
@PostMapping("/participant/saveParticipant")
- public void saveParticipant(@RequestBody SaveParticipant saveParticipant){
+ public void saveParticipant(@RequestBody SaveParticipant saveParticipant) {
try {
participantService.saveParticipant(saveParticipant);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -206,7 +199,7 @@
@ResponseBody
@PostMapping("/participant/counts")
- public Integer counts(@RequestBody Integer stuId){
- return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId",stuId));
+ public Integer counts(@RequestBody Integer stuId) {
+ return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId", stuId));
}
}
--
Gitblit v1.7.1