Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java

@@ -1,15 +1,23 @@
package com.dsh.competition.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.account.model.Student;
import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.model.AddParticipant;
import com.dsh.competition.model.EditParticipant;
import com.dsh.competition.model.ParticipantVo;
import com.dsh.competition.model.SaveParticipant;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.JuHeUtil;
import com.dsh.competition.util.ResultUtil;
import com.dsh.competition.util.TokenUtil;
import com.dsh.competition.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -98,6 +106,8 @@
   @Resource
   private StudentClient studentClient;

    @Resource
    private AppUserClient appUserClient;
    @ResponseBody
    @PostMapping("/api/participant/editParticipant")
    @ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", ""})
@@ -110,15 +120,42 @@
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            int numDigits = String.valueOf(editParticipant.getId()).length();

            if (editParticipant.getIsStudent()==0){
            return participantService.editParticipant(uid, editParticipant);}


            if (numDigits==9){
                Participant byId = participantService.getById(editParticipant.getId());
                editParticipant.setName(byId.getName());
                return participantService.editParticipant(uid, editParticipant);
            }
            else {
                AppUser appUser = new AppUser();
                appUser.setId(editParticipant.getId());


                TStudent student = new TStudent();
                student.setId(editParticipant.getId());

                TStudent student1 =   studentClient.queryById(editParticipant.getId());
                student.setName(student1.getName());
                student.setIdCard(editParticipant.getIdcard());
                if (editParticipant.getHeight()!=null) {
                    student.setHeight(Double.valueOf(editParticipant.getHeight()));
                }

                if (editParticipant.getWeight()!=null) {
                    student.setWeight(editParticipant.getWeight());
                }

                if(ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())){
                    Boolean aBoolean = JuHeUtil.idcardAuthentication(student.getIdCard(), student.getName());
                    if(!aBoolean){
                        return ResultUtil.error("身份证和姓名不匹配");
                    }
                }


                student.setPhone(editParticipant.getPhone());
                studentClient.updateAppUser(student);
                return ResultUtil.success();
            }
        }catch (Exception e){
@@ -162,4 +199,14 @@
            e.printStackTrace();
        }
    }

    @Autowired
    private UserCompetitionService userCompetitionService;


    @ResponseBody
    @PostMapping("/participant/counts")
    public Integer counts(@RequestBody Integer stuId){
       return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId",stuId));
    }
}