ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

10.28

tiaosheng
Wang0018 5 years ago
parent
bc57141788 e4f2eb27f3
commit
87fa9aebef
5 changed files with 745 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      mt/src/main/java/com/ccsens/mt/api/ProvinceController.java
  2. 29
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  3. 44
      mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
  4. 41
      mt/src/main/java/com/ccsens/mt/service/IProvinceService.java
  5. 826
      mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

49
mt/src/main/java/com/ccsens/mt/api/ProvinceController.java
View File

@ -107,7 +107,7 @@ public class ProvinceController {
@MustLogin
@ApiOperation(value = "添加/修改单位信息", notes = "")
@RequestMapping(value = "/save/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ProvinceCompeteVo.CompeteOverview> saveCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
public JsonResponse<ProvinceCompeteVo.CompeteCompany> saveCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
log.info("添加/修改单位信息：{}",params);
ProvinceCompeteVo.CompeteCompany competeCompany = provinceService.changeCompany(params.getParam());
log.info("添加/修改单位信息：{}",competeCompany);
@ -123,6 +123,53 @@ public class ProvinceController {
}
@MustLogin
@ApiOperation(value = "查找此单位的领队和教练信息", notes = "")
@RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<ProvinceCompeteVo.CompeteCompanyCoach> queryCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
log.info("查找此单位的领队和教练信息：{}",params);
ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = provinceService.queryCoach(params.getParam());
log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach);
return JsonResponse.newInstance().ok(competeCompanyCoach);
}
@MustLogin
@ApiOperation(value = "保存领队和教练信息", notes = "")
@RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
log.info("保存领队和教练信息：{}",params);
provinceService.saveCoach(params.getParam());
log.info("保存领队和教练信息：{}","插入成功");
return JsonResponse.newInstance().ok();
}
@MustLogin
@ApiOperation(value = "删除领队和教练信息", notes = "")
@RequestMapping(value = "/delete/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse deleteCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
log.info("删除领队和教练信息：{}",params);
provinceService.deleteCoach(params.getParam());
log.info("删除领队和教练信息：{}","删除成功");
return JsonResponse.newInstance().ok();
}
@MustLogin
@ApiOperation(value = "删除选手信息", notes = "")
@RequestMapping(value = "/del/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse deletePlayer(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.DelPlayer> params) {
log.info("删除选手信息：{}",params);
provinceService.deletePlayer(params.getParam());
log.info("删除选手信息：{}","删除成功");
return JsonResponse.newInstance().ok();
}
@MustLogin
@ApiOperation(value = "选手详细信息", notes = "")
@RequestMapping(value = "/playerInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.DelPlayer> params) {
log.info("选手详细信息：{}",params);
ProvinceCompeteVo.PlayerInfo playerInfo = provinceService.getPlayerInfo(params.getParam());
log.info("选手详细信息：{}",playerInfo);
return JsonResponse.newInstance().ok(playerInfo);
}
}

29
mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
View File

@ -249,5 +249,34 @@ public class CompeteDto {
private int authorization;
}
@Data
@ApiModel("当前用户参赛单位基本信息")
public static class AddCoach{
@ApiModelProperty("参赛单位id")
private Long companyId;
@ApiModelProperty("教练或领队的id，有则修改，没有则添加")
private Long cpachId;
@ApiModelProperty("身份: 0领队 1教练")
private int identity ;
@ApiModelProperty("姓名")
private String name ;
@ApiModelProperty("性别")
private int gender ;
@ApiModelProperty("手机号")
private String phone ;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("证件照（文件类型")
private Long idPhoto;
@ApiModelProperty("教练证（只有教练需要，文件类型")
private Long coachCertificate;
}
@Data
@ApiModel("项目id和组别id")
public static class DelPlayer{
@ApiModelProperty("选手id")
private Long playerId;
}
}

44
mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
View File

@ -104,4 +104,48 @@ public class ProvinceCompeteVo {
private int playerNum;
}
@Data
@ApiModel("查询当前用户参赛单位基本信息")
public static class CompeteCompanyCoach {
@ApiModelProperty("教练id")
private Long coachId;
@ApiModelProperty("领队id")
private Long guideId;
@ApiModelProperty("教练名字")
private String coachName;
@ApiModelProperty("领队名字")
private String guideName;
@ApiModelProperty("性别")
private int gender;
@ApiModelProperty("联系方式")
private String phone;
}
@Data
@ApiModel("查询当前用户参赛单位基本信息")
public static class PlayerInfo {
@ApiModelProperty("选手id")
private Long playerId ;
@ApiModelProperty("参赛单位id")
private Long competeId;
@ApiModelProperty("组别id")
private Long groupId;
@ApiModelProperty("选手姓名")
private String playerName;
@ApiModelProperty("性别")
private int gender;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("身份证正面照片 或户口本照片 （浏览路径）")
private String idCardFront ;
@ApiModelProperty("身份证反面照片（浏览路径）")
private String idCardBack;
@ApiModelProperty("一寸证件照（浏览路径）")
private Long idPhone;
@ApiModelProperty("学籍证明（浏览路径）")
private Long studentRecord;
@ApiModelProperty("体检证明（浏览路径）")
private Long healthRecord;
@ApiModelProperty("保险证明（浏览路径）")
private Long insuranceRecord;
}
}

41
mt/src/main/java/com/ccsens/mt/service/IProvinceService.java
View File

@ -80,4 +80,45 @@ public interface IProvinceService {
* @param param
*/
void updateLeader(ProvinceCompeteDto.ModifyLeader param);
/**
* 查找此单位的领队和教练信息
* @param
* @param
* @return
*/
ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param);
/**
* 添加领队和教练信息
* @param
* @param
* @return
*/
void saveCoach(CompeteDto.AddCoach param);
/**
* 删除领队和教练信息
* @param
* @param
* @return
*/
void deleteCoach(CompeteDto.AddCoach param);
/**
* 删除选手信息
* @param
* @param
* @return
*/
void deletePlayer(CompeteDto.DelPlayer param);
/**
* 查看选手信息
* @param
* @param
* @return
*/
ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param);
}

826
mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
View File

@ -1,243 +1,583 @@
package com.ccsens.mt.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import com.ccsens.mt.persist.dao.CompeteCompanyDao;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
import com.ccsens.mt.persist.dao.CompeteTimeDao;
import com.ccsens.mt.persist.mapper.CommonFileMapper;
import com.ccsens.mt.persist.mapper.CompeteCoachMapper;
import com.ccsens.mt.util.Constant;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.PropUtil;
import com.ccsens.util.UploadFileUtil_Servlet3;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.Part;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* @author 逗
*/
@Slf4j
@Service
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public class ProvinceService implements IProvinceService {
@Resource
private CompeteCompanyDao competeCompanyDao;
@Resource
private Snowflake snowflake;
@Resource
private CompeteTimeDao competeTimeDao;
@Resource
private CommonFileMapper commonFileMapper;
@Resource
private CompetePlayerDao competePlayerDao;
@Resource
private CompeteCoachMapper competeCoachMapper;
/**
* 查找当前用户填写的信息的概览
*/
@Override
public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) {
return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
}
/**
* 通过组别id查找本单位的注册选手
*/
@Override
public List<ProvinceCompeteVo.GroupAndPlayer> queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) {
return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId());
}
/**
* 查找一级项目
*/
@Override
public List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) {
List<ProvinceCompeteVo.FirstProject> firstProjects = new ArrayList<>();
//根据比赛类型查找大赛id
CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId());
if(ObjectUtil.isNotNull(competeTime)){
firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType());
}
return firstProjects;
}
@Override
public List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) {
return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId());
}
/**
* 添加或修改选手
*/
@Override
public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) throws Exception {
//判断选手id是否为空
if(ObjectUtil.isNull(param.getPlayerId())){
//id为空，新加一个选手
CompetePlayer player = new CompetePlayer();
player.setId(snowflake.nextId());
player.setName(param.getPlayerName());
player.setGender((byte) param.getGender());
player.setIdCard(param.getIdCard());
player.setCompanyId(param.getCompeteId());
player.setCompeteGroupId(param.getGroupId());
//添加身份证正面照片
player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
//身份证反面
player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
//一寸证件照
player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
//学籍证明
player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
//健康证明
player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
//保险证明
player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
competePlayerDao.insertSelective(player);
log.info("新加参赛选手：{}",player);
}else {
//否则修改选手信息
CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
log.info("查找需要修改的选手信息：{}",player);
if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
//字段不为空则修改
if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
competePlayerDao.updateByPrimaryKeySelective(player);
}
}
@Override
public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
}
/**
* 将上传的图片信息保存，并在数据库添加记录
*/
private Long uploadPhotoFile(Part file,Long userId) throws Exception {
log.info("上传文件:{}", file.getSubmittedFileName());
String allowedExt = "jpg,jpeg,png";
String dir = PropUtil.path;
String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
log.info(dir+""+path);
CommonFile fileDo = new CommonFile();
String name = file.getSubmittedFileName();
fileDo.setId(snowflake.nextId());
fileDo.setFileName(name);
fileDo.setLocation(dir + File.separator + path);
fileDo.setUserId(userId);
fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
commonFileMapper.insertSelective(fileDo);
log.info("保存文件：{}", fileDo);
return fileDo.getId();
}
@Override
public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) {
Long competeTimeId = param.getCompeteTimeId();
return competeCompanyDao.getCompany(competeTimeId,userId);
}
@Override
public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) {
//判断当前单位id是否为空，
Long companyid = param.getCompanyId();
CompeteCompany competeCompany = new CompeteCompany();
ProvinceCompeteVo.CompeteCompany competeCompany1;
//单位id为空，新增
if (ObjectUtil.isNull(companyid)){
Long id = snowflake.nextId();
competeCompany.setId(id);
competeCompany.setCoachNum(param.getCoachNum());
competeCompany.setName(param.getCompanyName());
competeCompany.setContactsName(param.getContactsName());
competeCompany.setContactsPhone(param.getContactsPhone());
competeCompany.setLeaderNum(param.getGuideNum());
competeCompany.setJoinNum(param.getPlayerNum());
competeCompanyDao.insertSelective(competeCompany);
CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
competeCompanyExample.createCriteria().andIdEqualTo(companyid);
competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
}else {
//不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改
CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
competeCompanyExample.createCriteria().andIdEqualTo(companyid);
competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
if (ObjectUtil.isNotNull(param.getCoachNum())){
competeCompany.setCoachNum(param.getCoachNum());
}
if (ObjectUtil.isNotNull(param.getCompanyName())) {
competeCompany.setName(param.getCompanyName());
}
if (ObjectUtil.isNotNull(param.getContactsName())) {
competeCompany.setContactsName(param.getContactsName());
}
if (ObjectUtil.isNotNull(param.getContactsPhone())) {
competeCompany.setContactsPhone(param.getContactsPhone());
}
if (ObjectUtil.isNotNull(param.getGuideNum())) {
competeCompany.setLeaderNum(param.getGuideNum());
}
if (ObjectUtil.isNotNull(param.getPlayerNum())) {
competeCompany.setJoinNum(param.getPlayerNum());
}
competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId());
competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
}
return competeCompany1;
}
@Override
public void updateLeader(ProvinceCompeteDto.ModifyLeader param) {
Long coachId=param.getCoachId();
if(ObjectUtil.isNull(coachId)){
CompeteCoach competeCoach=new CompeteCoach();
competeCoach.setId(snowflake.nextId());
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.insertSelective(competeCoach);
}else{
CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId);
if(ObjectUtil.isNotNull(competeCoach)){
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.updateByPrimaryKeySelective(competeCoach);
}
}
}
}
//<<<<<<< HEAD
//package com.ccsens.mt.service;
//
//import cn.hutool.core.bean.BeanUtil;
//import cn.hutool.core.lang.Snowflake;
//import cn.hutool.core.util.ObjectUtil;
//import cn.hutool.core.util.StrUtil;
//import com.ccsens.mt.bean.dto.CompeteDto;
//import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
//import com.ccsens.mt.bean.po.*;
//import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
//import com.ccsens.mt.persist.dao.CompeteCompanyDao;
//import com.ccsens.mt.persist.dao.CompetePlayerDao;
//import com.ccsens.mt.persist.dao.CompeteTimeDao;
//import com.ccsens.mt.persist.mapper.CommonFileMapper;
//import com.ccsens.mt.persist.mapper.CompeteCoachMapper;
//import com.ccsens.mt.util.Constant;
//import com.ccsens.util.CodeEnum;
//import com.ccsens.util.PropUtil;
//import com.ccsens.util.UploadFileUtil_Servlet3;
//import com.ccsens.util.exception.BaseException;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Propagation;
//import org.springframework.transaction.annotation.Transactional;
//
//import javax.annotation.Resource;
//import javax.servlet.http.Part;
//import java.io.File;
//import java.util.ArrayList;
//import java.util.List;
//
///**
// * @author 逗
// */
//@Slf4j
//@Service
//@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
//public class ProvinceService implements IProvinceService {
// @Resource
// private CompeteCompanyDao competeCompanyDao;
// @Resource
// private Snowflake snowflake;
// @Resource
// private CompeteTimeDao competeTimeDao;
// @Resource
// private CommonFileMapper commonFileMapper;
// @Resource
// private CompetePlayerDao competePlayerDao;
//
// @Resource
// private CompeteCoachMapper competeCoachMapper;
//
// /**
// * 查找当前用户填写的信息的概览
// */
// @Override
// public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) {
// return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
// }
//
// /**
// * 通过组别id查找本单位的注册选手
// */
// @Override
// public List<ProvinceCompeteVo.GroupAndPlayer> queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) {
// return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId());
// }
//
//
// /**
// * 查找一级项目
// */
// @Override
// public List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) {
// List<ProvinceCompeteVo.FirstProject> firstProjects = new ArrayList<>();
// //根据比赛类型查找大赛id
// CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId());
// if(ObjectUtil.isNotNull(competeTime)){
// firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType());
// }
// return firstProjects;
// }
//
// @Override
// public List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) {
// return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId());
// }
//
// /**
// * 添加或修改选手
// */
// @Override
// public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) throws Exception {
// //判断选手id是否为空
// if(ObjectUtil.isNull(param.getPlayerId())){
// //id为空，新加一个选手
// CompetePlayer player = new CompetePlayer();
// player.setId(snowflake.nextId());
// player.setName(param.getPlayerName());
// player.setGender((byte) param.getGender());
// player.setIdCard(param.getIdCard());
// player.setCompanyId(param.getCompeteId());
// player.setCompeteGroupId(param.getGroupId());
// //添加身份证正面照片
// player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //身份证反面
// player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //一寸证件照
// player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //学籍证明
// player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //健康证明
// player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
// //保险证明
// player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
// competePlayerDao.insertSelective(player);
// log.info("新加参赛选手：{}",player);
// }else {
// //否则修改选手信息
// CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
// log.info("查找需要修改的选手信息：{}",player);
// if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
// //字段不为空则修改
// if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
// if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
// if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
// if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
// if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
// if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
// competePlayerDao.updateByPrimaryKeySelective(player);
// }
// }
//
// @Override
// public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
//
// return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
// }
//
// /**
// * 将上传的图片信息保存，并在数据库添加记录
// */
// private Long uploadPhotoFile(Part file,Long userId) throws Exception {
// log.info("上传文件:{}", file.getSubmittedFileName());
// String allowedExt = "jpg,jpeg,png";
// String dir = PropUtil.path;
// String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
// log.info(dir+""+path);
//
// CommonFile fileDo = new CommonFile();
// String name = file.getSubmittedFileName();
// fileDo.setId(snowflake.nextId());
// fileDo.setFileName(name);
// fileDo.setLocation(dir + File.separator + path);
// fileDo.setUserId(userId);
// fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
// commonFileMapper.insertSelective(fileDo);
// log.info("保存文件：{}", fileDo);
// return fileDo.getId();
//
// }
//
//
// @Override
// public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) {
// Long competeTimeId = param.getCompeteTimeId();
// return competeCompanyDao.getCompany(competeTimeId,userId);
// }
//
// @Override
// public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) {
// //判断当前单位id是否为空，
// Long companyid = param.getCompanyId();
// CompeteCompany competeCompany = new CompeteCompany();
// ProvinceCompeteVo.CompeteCompany competeCompany1;
// //单位id为空，新增
// if (ObjectUtil.isNull(companyid)){
// Long id = snowflake.nextId();
// competeCompany.setId(id);
// competeCompany.setCoachNum(param.getCoachNum());
// competeCompany.setName(param.getCompanyName());
// competeCompany.setContactsName(param.getContactsName());
// competeCompany.setContactsPhone(param.getContactsPhone());
// competeCompany.setLeaderNum(param.getGuideNum());
// competeCompany.setJoinNum(param.getPlayerNum());
// competeCompanyDao.insertSelective(competeCompany);
// CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
// competeCompanyExample.createCriteria().andIdEqualTo(companyid);
// competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
// }else {
// //不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改
// CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
// competeCompanyExample.createCriteria().andIdEqualTo(companyid);
// competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
// if (ObjectUtil.isNotNull(param.getCoachNum())){
// competeCompany.setCoachNum(param.getCoachNum());
// }
// if (ObjectUtil.isNotNull(param.getCompanyName())) {
// competeCompany.setName(param.getCompanyName());
// }
// if (ObjectUtil.isNotNull(param.getContactsName())) {
// competeCompany.setContactsName(param.getContactsName());
// }
// if (ObjectUtil.isNotNull(param.getContactsPhone())) {
// competeCompany.setContactsPhone(param.getContactsPhone());
// }
// if (ObjectUtil.isNotNull(param.getGuideNum())) {
// competeCompany.setLeaderNum(param.getGuideNum());
// }
// if (ObjectUtil.isNotNull(param.getPlayerNum())) {
// competeCompany.setJoinNum(param.getPlayerNum());
// }
// competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
// competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId());
// competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
// }
// return competeCompany1;
// }
//
// @Override
// public void updateLeader(ProvinceCompeteDto.ModifyLeader param) {
// Long coachId=param.getCoachId();
// if(ObjectUtil.isNull(coachId)){
// CompeteCoach competeCoach=new CompeteCoach();
// competeCoach.setId(snowflake.nextId());
// BeanUtil.copyProperties(param,competeCoach);
// competeCoachMapper.insertSelective(competeCoach);
// }else{
// CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId);
// if(ObjectUtil.isNotNull(competeCoach)){
// BeanUtil.copyProperties(param,competeCoach);
// competeCoachMapper.updateByPrimaryKeySelective(competeCoach);
// }
// }
// }
//
//}
package com.ccsens.mt.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
import com.ccsens.mt.persist.dao.CompeteCompanyDao;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
import com.ccsens.mt.persist.dao.CompeteTimeDao;
import com.ccsens.mt.persist.mapper.CommonFileMapper;
import com.ccsens.mt.persist.mapper.CompeteCoachMapper;
import com.ccsens.mt.persist.mapper.CompetePlayerMapper;
import com.ccsens.mt.util.Constant;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.PropUtil;
import com.ccsens.util.UploadFileUtil_Servlet3;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.Part;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* @author 逗
*/
@Slf4j
@Service
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public class ProvinceService implements IProvinceService {
@Resource
private CompeteCompanyDao competeCompanyDao;
@Resource
private Snowflake snowflake;
@Resource
private CompeteTimeDao competeTimeDao;
@Resource
private CommonFileMapper commonFileMapper;
@Resource
private CompetePlayerDao competePlayerDao;
@Resource
private CompeteCoachMapper competeCoachMapper;
@Resource
private CompetePlayerMapper competePlayerMapper;
/**
* 查找当前用户填写的信息的概览
*/
@Override
public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) {
return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
}
/**
* 通过组别id查找本单位的注册选手
*/
@Override
public List<ProvinceCompeteVo.GroupAndPlayer> queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) {
return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId());
}
/**
* 查找一级项目
*/
@Override
public List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) {
List<ProvinceCompeteVo.FirstProject> firstProjects = new ArrayList<>();
//根据比赛类型查找大赛id
CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId());
if(ObjectUtil.isNotNull(competeTime)){
firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType());
}
return firstProjects;
}
@Override
public List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) {
return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId());
}
/**
* 添加或修改选手
*/
@Override
public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) throws Exception {
//判断选手id是否为空
if(ObjectUtil.isNull(param.getPlayerId())){
//id为空，新加一个选手
CompetePlayer player = new CompetePlayer();
player.setId(snowflake.nextId());
player.setName(param.getPlayerName());
player.setGender((byte) param.getGender());
player.setIdCard(param.getIdCard());
player.setCompanyId(param.getCompeteId());
player.setCompeteGroupId(param.getGroupId());
//添加身份证正面照片
player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
//身份证反面
player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
//一寸证件照
player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
//学籍证明
player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
//健康证明
player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
//保险证明
player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
competePlayerDao.insertSelective(player);
log.info("新加参赛选手：{}",player);
}else {
//否则修改选手信息
CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
log.info("查找需要修改的选手信息：{}",player);
if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
//字段不为空则修改
if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
competePlayerDao.updateByPrimaryKeySelective(player);
}
}
@Override
public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
}
/**
* 将上传的图片信息保存，并在数据库添加记录
*/
private Long uploadPhotoFile(Part file,Long userId) throws Exception {
log.info("上传文件:{}", file.getSubmittedFileName());
String allowedExt = "jpg,jpeg,png";
String dir = PropUtil.path;
String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
log.info(dir+""+path);
CommonFile fileDo = new CommonFile();
String name = file.getSubmittedFileName();
fileDo.setId(snowflake.nextId());
fileDo.setFileName(name);
fileDo.setLocation(dir + File.separator + path);
fileDo.setUserId(userId);
fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
commonFileMapper.insertSelective(fileDo);
log.info("保存文件：{}", fileDo);
return fileDo.getId();
}
@Override
public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) {
Long competeTimeId = param.getCompeteTimeId();
return competeCompanyDao.getCompany(competeTimeId,userId);
}
@Override
public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) {
//判断当前单位id是否为空，
Long companyid = param.getCompanyId();
CompeteCompany competeCompany = new CompeteCompany();
ProvinceCompeteVo.CompeteCompany competeCompany1;
//单位id为空，新增
if (ObjectUtil.isNull(companyid)){
Long id = snowflake.nextId();
competeCompany.setId(id);
competeCompany.setCoachNum(param.getCoachNum());
competeCompany.setName(param.getCompanyName());
competeCompany.setContactsName(param.getContactsName());
competeCompany.setContactsPhone(param.getContactsPhone());
competeCompany.setLeaderNum(param.getGuideNum());
competeCompany.setJoinNum(param.getPlayerNum());
competeCompanyDao.insertSelective(competeCompany);
CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
competeCompanyExample.createCriteria().andIdEqualTo(companyid);
competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
}else {
//不为空，根据单位id查出来修改 判断传进来的参数是否为空 为空则跳过 不为空则修改
CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
competeCompanyExample.createCriteria().andIdEqualTo(companyid);
competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
if (ObjectUtil.isNotNull(param.getCoachNum())){
competeCompany.setCoachNum(param.getCoachNum());
}
if (ObjectUtil.isNotNull(param.getCompanyName())) {
competeCompany.setName(param.getCompanyName());
}
if (ObjectUtil.isNotNull(param.getContactsName())) {
competeCompany.setContactsName(param.getContactsName());
}
if (ObjectUtil.isNotNull(param.getContactsPhone())) {
competeCompany.setContactsPhone(param.getContactsPhone());
}
if (ObjectUtil.isNotNull(param.getGuideNum())) {
competeCompany.setLeaderNum(param.getGuideNum());
}
if (ObjectUtil.isNotNull(param.getPlayerNum())) {
competeCompany.setJoinNum(param.getPlayerNum());
}
competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId());
competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
}
return competeCompany1;
}
@Override
public ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param) {
Long company = param.getCompanyId();
CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(company);
if (ObjectUtil.isNull(competeCoach)){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
if (competeCoach.getIdentity() == 0){
//给领队赋值
competeCompanyCoach.setCoachName(competeCoach.getName());
competeCompanyCoach.setCoachId(competeCoach.getId());
competeCompanyCoach.setGender(competeCoach.getGender());
competeCompanyCoach.setPhone(competeCoach.getPhone());
}else {
competeCompanyCoach.setGuideName(competeCoach.getName());
competeCompanyCoach.setCoachId(competeCoach.getId());
competeCompanyCoach.setGender(competeCoach.getGender());
competeCompanyCoach.setPhone(competeCoach.getPhone());
}
return competeCompanyCoach;
}
@Override
public void saveCoach(CompeteDto.AddCoach param) {
CompeteCoach competeCoach = new CompeteCoach();
Long companyId = param.getCompanyId();
competeCoach.setCompanyId(companyId);
Long cpachId = param.getCpachId();
competeCoach.setId(cpachId);
int identity = param.getIdentity();
competeCoach.setIdentity((byte) identity);
String name = param.getName();
competeCoach.setName(name);
int gender = param.getGender();
competeCoach.setGender((byte) gender);
String phone = param.getPhone();
competeCoach.setPhone(phone);
String idCard = param.getIdCard();
competeCoach.setIdCard(idCard);
Long idPhoto = param.getIdPhoto();
competeCoach.setIdPhoto(idPhoto);
Long coachCertificate = param.getCoachCertificate();
competeCoach.setCoachCertificate(coachCertificate);
competeCoachMapper.insertSelective(competeCoach);
}
@Override
public void deleteCoach(CompeteDto.AddCoach param) {
Long cpachId = param.getCpachId();
CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(cpachId);
competeCoach.setRecStatus((byte) 2);
CompeteCoachExample competeCoachExample = new CompeteCoachExample();
competeCoachExample.createCriteria().andIdEqualTo(cpachId);
competeCoachMapper.updateByExample(competeCoach,competeCoachExample);
}
@Override
public void deletePlayer(CompeteDto.DelPlayer param) {
Long playerId = param.getPlayerId();
// competePlayerMapper.deleteByPrimaryKey(playerId);
CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
competePlayer.setRecStatus((byte) 2);
CompetePlayerExample competePlayerExample = new CompetePlayerExample();
competePlayerExample.createCriteria().andIdEqualTo(playerId);
competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample);
}
@Override
public ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param) {
Long playerId = param.getPlayerId();
CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
if (ObjectUtil.isNull(competePlayer)){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
ProvinceCompeteVo.PlayerInfo playerInfo = new ProvinceCompeteVo.PlayerInfo();
playerInfo.setPlayerId(competePlayer.getId());
playerInfo.setCompeteId(competePlayer.getCompeteTimeId());
playerInfo.setGroupId(competePlayer.getCompeteGroupId());
playerInfo.setPlayerName(competePlayer.getName());
playerInfo.setGender(competePlayer.getGender());
playerInfo.setIdCard(competePlayer.getIdCard());
playerInfo.setIdCardFront(competePlayer.getIdCardFront());
playerInfo.setIdCardBack(competePlayer.getIdCardBack());
playerInfo.setIdPhone(competePlayer.getIdPhotoFile());
playerInfo.setStudentRecord(competePlayer.getStudentRecordFile());
playerInfo.setHealthRecord(competePlayer.getHealthRecordFile());
playerInfo.setInsuranceRecord(competePlayer.getInsuranceRecordFile());
return playerInfo;
}
@Override
public void updateLeader(ProvinceCompeteDto.ModifyLeader param) {
Long coachId=param.getCoachId();
if(ObjectUtil.isNull(coachId)){
CompeteCoach competeCoach=new CompeteCoach();
competeCoach.setId(snowflake.nextId());
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.insertSelective(competeCoach);
}else{
CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId);
if(ObjectUtil.isNotNull(competeCoach)){
BeanUtil.copyProperties(param,competeCoach);
competeCoachMapper.updateByPrimaryKeySelective(competeCoach);
}
}
}
}

Write Preview
Loading…
Cancel
Save