From b88fc3dfa349c3293f8906ca9fea6718cb88feab Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 28 Oct 2020 09:04:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20201028=5F=E6=B5=8B=E8=AF=95=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A81.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/ProvinceController.java | 43 +++++++ .../mt/bean/dto/ProvinceCompeteDto.java | 56 +++++++++ .../com/ccsens/mt/bean/po/CompeteCompany.java | 12 +- .../mt/bean/po/CompeteCompanyExample.java | 48 ++++---- .../com/ccsens/mt/bean/po/CompeteProject.java | 11 ++ .../mt/bean/po/CompeteProjectExample.java | 60 +++++++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 33 ++++- .../mt/persist/dao/CompeteCompanyDao.java | 36 +++++- .../ccsens/mt/service/IProvinceService.java | 43 ++++++- .../ccsens/mt/service/ProvinceService.java | 94 ++++++++++++++ .../mapper_dao/CompeteCompanyDao.xml | 115 ++++++++++++++++++ .../mapper_raw/CompeteCompanyMapper.xml | 28 ++--- .../mapper_raw/CompeteProjectMapper.xml | 25 +++- .../ccsens/tall/persist/dao/ProRoleDao.java | 8 ++ .../ccsens/tall/service/IProRoleService.java | 15 +-- .../ccsens/tall/service/ProRoleService.java | 9 +- .../com/ccsens/tall/web/RoleController.java | 29 ++--- tall/src/main/resources/application.yml | 4 +- .../main/resources/mapper_dao/ProRoleDao.xml | 15 +++ 19 files changed, 606 insertions(+), 78 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index d676f4d9..167b979c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -2,6 +2,7 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.service.IProvinceService; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author 逗 @@ -40,4 +42,45 @@ public class ProvinceController { return JsonResponse.newInstance().ok(competeOverview); } + @MustLogin + @ApiOperation(value = "根据组别查找本单位所有注册的选手", notes = "") + @RequestMapping(value = "/group/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryPlayerByGroupId( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("根据组别查找本单位所有注册的选手：{}",params); + List groupAndPlayers = provinceService.queryPlayerByGroupId(params.getParam(),params.getUserId()); + log.info("根据组别查找本单位所有注册的选手：{}",groupAndPlayers); + return JsonResponse.newInstance().ok(groupAndPlayers); + } + + @MustLogin + @ApiOperation(value = "根据大赛id查找所有的一级项目", notes = "") + @RequestMapping(value = "/first/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryFirstProjectByCompeteTimeId( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找所有的一级项目：{}",params); + List projectList = provinceService.queryFirstProjectByCompeteTimeId(params.getParam(),params.getUserId()); + log.info("查找所有的一级项目：{}",projectList); + return JsonResponse.newInstance().ok(projectList); + } + +// @MustLogin +// @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "") +// @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse> queryProjectByFirstProject( +// @ApiParam @Validated @RequestBody QueryDto params) { +// log.info("查找二级比赛项目的信息：{}",params); +// List projectList = provinceService.queryProjectByCompeteTimeId(params.getParam(),params.getUserId()); +// log.info("查找二级比赛项目的信息：{}",projectList); +// return JsonResponse.newInstance().ok(projectList); +// } + + @MustLogin + @ApiOperation(value = "新加/修改参赛人员", notes = "") + @RequestMapping(value = "/save/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse saveOrUpdatePlayer( @ApiParam QueryDto params) { + log.info("新加/修改参赛人员：{}",params); + provinceService.saveOrUpdatePlayer(params.getParam(),params.getUserId()); + return JsonResponse.newInstance().ok(); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java new file mode 100644 index 00000000..726b2f96 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -0,0 +1,56 @@ +package com.ccsens.mt.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.servlet.http.Part; +import javax.validation.constraints.NotNull; + +/** + * @author 逗 + */ +@Data +public class ProvinceCompeteDto { + + @Data + @ApiModel("通过组别查找本单位注册的选手") + public static class QueryPlayerByGroup{ + @NotNull + @ApiModelProperty("参赛单位id") + private Long companyId; + @ApiModelProperty("组别id") + private Long groupId; + @ApiModelProperty("项目id") + private Long projectId; + } + + @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 Part idCardFront; + @ApiModelProperty("身份证反面照片") + private Part idCardBack; + @ApiModelProperty("证件照") + private Part idPhone; + @ApiModelProperty("学籍照片") + private Part studentRecord; + @ApiModelProperty("体检证明照片") + private Part healthRecord; + @ApiModelProperty("保险证明照片") + private Part insuranceRecord; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompany.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompany.java index a8c03ff7..b79178b1 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompany.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompany.java @@ -22,7 +22,7 @@ public class CompeteCompany implements Serializable { private Integer leaderNum; - private Integer judgmentNum; + private Integer coachNum; private Byte authorization; @@ -106,12 +106,12 @@ public class CompeteCompany implements Serializable { this.leaderNum = leaderNum; } - public Integer getJudgmentNum() { - return judgmentNum; + public Integer getCoachNum() { + return coachNum; } - public void setJudgmentNum(Integer judgmentNum) { - this.judgmentNum = judgmentNum; + public void setCoachNum(Integer coachNum) { + this.coachNum = coachNum; } public Byte getAuthorization() { @@ -161,7 +161,7 @@ public class CompeteCompany implements Serializable { sb.append(", userId=").append(userId); sb.append(", joinNum=").append(joinNum); sb.append(", leaderNum=").append(leaderNum); - sb.append(", judgmentNum=").append(judgmentNum); + sb.append(", coachNum=").append(coachNum); sb.append(", authorization=").append(authorization); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompanyExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompanyExample.java index 3fb558b5..df5da771 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompanyExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCompanyExample.java @@ -675,63 +675,63 @@ public class CompeteCompanyExample { return (Criteria) this; } - public Criteria andJudgmentNumIsNull() { - addCriterion("judgment_num is null"); + public Criteria andCoachNumIsNull() { + addCriterion("coach_num is null"); return (Criteria) this; } - public Criteria andJudgmentNumIsNotNull() { - addCriterion("judgment_num is not null"); + public Criteria andCoachNumIsNotNull() { + addCriterion("coach_num is not null"); return (Criteria) this; } - public Criteria andJudgmentNumEqualTo(Integer value) { - addCriterion("judgment_num =", value, "judgmentNum"); + public Criteria andCoachNumEqualTo(Integer value) { + addCriterion("coach_num =", value, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumNotEqualTo(Integer value) { - addCriterion("judgment_num <>", value, "judgmentNum"); + public Criteria andCoachNumNotEqualTo(Integer value) { + addCriterion("coach_num <>", value, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumGreaterThan(Integer value) { - addCriterion("judgment_num >", value, "judgmentNum"); + public Criteria andCoachNumGreaterThan(Integer value) { + addCriterion("coach_num >", value, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumGreaterThanOrEqualTo(Integer value) { - addCriterion("judgment_num >=", value, "judgmentNum"); + public Criteria andCoachNumGreaterThanOrEqualTo(Integer value) { + addCriterion("coach_num >=", value, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumLessThan(Integer value) { - addCriterion("judgment_num <", value, "judgmentNum"); + public Criteria andCoachNumLessThan(Integer value) { + addCriterion("coach_num <", value, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumLessThanOrEqualTo(Integer value) { - addCriterion("judgment_num <=", value, "judgmentNum"); + public Criteria andCoachNumLessThanOrEqualTo(Integer value) { + addCriterion("coach_num <=", value, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumIn(List values) { - addCriterion("judgment_num in", values, "judgmentNum"); + public Criteria andCoachNumIn(List values) { + addCriterion("coach_num in", values, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumNotIn(List values) { - addCriterion("judgment_num not in", values, "judgmentNum"); + public Criteria andCoachNumNotIn(List values) { + addCriterion("coach_num not in", values, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumBetween(Integer value1, Integer value2) { - addCriterion("judgment_num between", value1, value2, "judgmentNum"); + public Criteria andCoachNumBetween(Integer value1, Integer value2) { + addCriterion("coach_num between", value1, value2, "coachNum"); return (Criteria) this; } - public Criteria andJudgmentNumNotBetween(Integer value1, Integer value2) { - addCriterion("judgment_num not between", value1, value2, "judgmentNum"); + public Criteria andCoachNumNotBetween(Integer value1, Integer value2) { + addCriterion("coach_num not between", value1, value2, "coachNum"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java index bc7548fe..21574449 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProject.java @@ -30,6 +30,8 @@ public class CompeteProject implements Serializable { private Byte recStatus; + private Long competeTimeId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -136,6 +138,14 @@ public class CompeteProject implements Serializable { this.recStatus = recStatus; } + public Long getCompeteTimeId() { + return competeTimeId; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -155,6 +165,7 @@ public class CompeteProject implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", competeTimeId=").append(competeTimeId); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java index 027aa78c..6a4748a5 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectExample.java @@ -894,6 +894,66 @@ public class CompeteProjectExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andCompeteTimeIdIsNull() { + addCriterion("compete_time_id is null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNotNull() { + addCriterion("compete_time_id is not null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdEqualTo(Long value) { + addCriterion("compete_time_id =", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotEqualTo(Long value) { + addCriterion("compete_time_id <>", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThan(Long value) { + addCriterion("compete_time_id >", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("compete_time_id >=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThan(Long value) { + addCriterion("compete_time_id <", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThanOrEqualTo(Long value) { + addCriterion("compete_time_id <=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIn(List values) { + addCriterion("compete_time_id in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotIn(List values) { + addCriterion("compete_time_id not in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdBetween(Long value1, Long value2) { + addCriterion("compete_time_id between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotBetween(Long value1, Long value2) { + addCriterion("compete_time_id not between", value1, value2, "competeTimeId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 81506c46..4889840f 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -4,7 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; +import java.util.List; + /** * @author 逗 @@ -25,4 +26,34 @@ public class ProvinceCompeteVo { @ApiModelProperty("当前添加的参赛人员的人数") private int playerNum; } + @Data + @ApiModel("查找组别和组别下的选手信息") + public static class GroupAndPlayer{ + @ApiModelProperty("组别id") + private Long groupId; + @ApiModelProperty("组别名字") + private String groupName; + @ApiModelProperty("组别名字") + private List playerList; + } + + @Data + @ApiModel("组别下选手信息") + public static class PlayerInfoByGroup{ + @ApiModelProperty("选手id") + private Long playerId; + @ApiModelProperty("选手名称") + private String playerName; + @ApiModelProperty("是否参加了本项目") + private int joinProject; + } + + @Data + @ApiModel("查找一级比赛项目信息") + public static class FirstProject { + @ApiModelProperty("一级项目id") + private Long parentProjectId; + @ApiModelProperty("一级项目名字") + private String parentProjectName; + } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 9db29173..cfeea0dd 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -1,14 +1,48 @@ package com.ccsens.mt.persist.dao; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author 逗 */ @Repository public interface CompeteCompanyDao extends CompeteCompanyMapper { - ProvinceCompeteVo.CompeteOverview getCompanyOverview(Long competeTimeId, Long userId); + /** + * 查找当前用户填写的信息的概览 + * @param competeTimeId 大赛id + * @param userId userId + * @return 返回信息概览 + */ + ProvinceCompeteVo.CompeteOverview getCompanyOverview(@Param("competeTimeId")Long competeTimeId, @Param("userId")Long userId); + + /** + * 通过组别id查询选手信息 + * @param companyId 单位id + * @param groupId 组别id + * @param projectId 项目id + * @return 返回选手信息 + */ + List queryPlayerByGroupId(@Param("companyId")Long companyId,@Param("groupId")Long groupId,@Param("projectId")Long projectId); + + /** + * 查找大赛所有的比赛项目 + * @param competeTimeId 大赛id + * @return 返回所有比赛项目信息 + */ + List queryProjectByCompeteTimeId(@Param("competeTimeId")Long competeTimeId); + + /** + * 查找一级项目 + * @param type 比赛类型 + * @return 返回一级项目信息 + */ + List queryFirstProjectByCompeteTimeId(@Param("type")int type); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index e25589fa..c94aa184 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -1,17 +1,54 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import java.util.List; + /** * @author 逗 */ public interface IProvinceService { /** * 查找当前用户填写的信息的概览 - * @param param - * @param userId - * @return + * @param param 大赛id + * @param userId userId + * @return 返回当前用户填写的信息的概览 */ ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId); + + /** + * 通过组别查找当前单位的选手 + * @param param 组别单位信息 + * @param userId userId + * @return 返回选手id姓名和是否参赛的信息 + */ + List queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId); + +// /** +// * 查找本次大赛所有的项目 +// * @param param 大赛id +// * @param userId userId +// * @return 返回比赛项目的信息 +// */ +// List queryProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId); + + /** + * 查找一级项目 + * @param param 大赛id + * @param userId userId + * @return 返回一级项目 + */ + List queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId); + + + /** + * 添加或修改选手 + * @param param 选手信息 + * @param userId userId + */ + void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId); + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index f08b5a18..b105f197 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -1,14 +1,31 @@ package com.ccsens.mt.service; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.po.CompeteCompany; +import com.ccsens.mt.bean.po.CompetePlayer; +import com.ccsens.mt.bean.po.CompeteTime; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.persist.dao.CompeteCompanyDao; +import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.mapper.CompetePlayerMapper; +import com.ccsens.util.NotSupportedFileTypeException; +import com.ccsens.util.PropUtil; +import com.ccsens.util.UploadFileUtil_Servlet3; +import com.ccsens.util.WebConstant; 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 逗 @@ -19,9 +36,86 @@ import javax.annotation.Resource; public class ProvinceService implements IProvinceService{ @Resource private CompeteCompanyDao competeCompanyDao; + @Resource + private Snowflake snowflake; + @Resource + private CompetePlayerMapper playerMapper; + @Resource + private CompeteTimeDao competeTimeDao; + /** + * 查找当前用户填写的信息的概览 + */ @Override public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) { return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId); } + + /** + * 通过组别id查找本单位的注册选手 + */ + @Override + public List queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) { + return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId()); + } + +// /** +// * 查找大赛所有的比赛项目 +// */ +// @Override +// public List queryProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) { +// return competeCompanyDao.queryProjectByCompeteTimeId(param.getCompeteTimeId()); +// } + + /** + * 查找一级项目 + */ + @Override + public List queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) { + List firstProjects = new ArrayList<>(); + //根据比赛类型查找大赛id + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); + if(ObjectUtil.isNotNull(competeTime)){ + firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType()); + } + return firstProjects; + } + + /** + * 添加或修改选手 + */ + @Override + public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) { + //判断选手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()); + //添加身份证正面照片 + }else { + //否则修改选手信息 + } + } + + /** + * 将上传的图片信息保存，并在数据库添加记录 + */ + private Long uploadFile(Part file) throws Exception { + //1.上传文件 + String allowedExts = "jpg,jpeg,png"; + String dir = PropUtil.path; + String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExts, dir); + log.info(dir+""+path); + //获取文件路径，文件名，和文件大小 + String filePath = WebConstant.UPLOAD_PATH_PROJECT + File.separator + path; + String name = UploadFileUtil_Servlet3.getFileNameByPart(file); + //导入数据库 + return null; + } + } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 17d49716..e67a885c 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -2,7 +2,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCompanyMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCompanyMapper.xml index a3a835fe..3d1c7e21 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCompanyMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCompanyMapper.xml @@ -11,7 +11,7 @@ - + @@ -77,7 +77,7 @@ id, name, type, compete_time_id, contacts_name, contacts_phone, user_id, join_num, - leader_num, judgment_num, authorization, created_at, updated_at, rec_status + leader_num, coach_num, authorization, created_at, updated_at, rec_status select @@ -113,12 +114,12 @@ level, team, join_rule, certificate, member_min, member_max, type, created_at, updated_at, - rec_status) + rec_status, compete_time_id) values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{level,jdbcType=TINYINT}, #{team,jdbcType=TINYINT}, #{joinRule,jdbcType=TINYINT}, #{certificate,jdbcType=TINYINT}, #{memberMin,jdbcType=INTEGER}, #{memberMax,jdbcType=INTEGER}, #{type,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) + #{recStatus,jdbcType=TINYINT}, #{competeTimeId,jdbcType=BIGINT}) insert into t_compete_project @@ -162,6 +163,9 @@ rec_status, + + compete_time_id, + @@ -203,6 +207,9 @@ #{recStatus,jdbcType=TINYINT}, + + #{competeTimeId,jdbcType=BIGINT}, + + \ No newline at end of file From 575537d233bcb4eaa98a505d0aaa1a87682885d1 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 28 Oct 2020 09:40:13 +0800 Subject: [PATCH 2/2] 20201028V1.1 --- .../com/ccsens/mt/api/ProvinceController.java | 20 +++++++++---------- .../mt/bean/dto/ProvinceCompeteDto.java | 8 ++++++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 19 ++++++++++++++++-- .../mt/persist/dao/CompeteCompanyDao.java | 7 +++++++ .../ccsens/mt/service/IProvinceService.java | 8 ++++++++ .../ccsens/mt/service/ProvinceService.java | 8 ++++++-- mt/src/main/resources/application.yml | 4 ++-- .../mapper_dao/CompeteCompanyDao.xml | 18 +++++++++++++++-- 8 files changed, 74 insertions(+), 18 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index 167b979c..3896b129 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -64,16 +64,16 @@ public class ProvinceController { return JsonResponse.newInstance().ok(projectList); } -// @MustLogin -// @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "") -// @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse> queryProjectByFirstProject( -// @ApiParam @Validated @RequestBody QueryDto params) { -// log.info("查找二级比赛项目的信息：{}",params); -// List projectList = provinceService.queryProjectByCompeteTimeId(params.getParam(),params.getUserId()); -// log.info("查找二级比赛项目的信息：{}",projectList); -// return JsonResponse.newInstance().ok(projectList); -// } + @MustLogin + @ApiOperation(value = "根据一级项目id查找二级比赛项目的信息", notes = "") + @RequestMapping(value = "/second/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryProjectByFirstProject( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找二级比赛项目的信息：{}",params); + List projectList = provinceService.queryProjectByFirstProject(params.getParam(),params.getUserId()); + log.info("查找二级比赛项目的信息：{}",projectList); + return JsonResponse.newInstance().ok(projectList); + } @MustLogin @ApiOperation(value = "新加/修改参赛人员", notes = "") diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index 726b2f96..63b58130 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -13,6 +13,14 @@ import javax.validation.constraints.NotNull; @Data public class ProvinceCompeteDto { + @Data + @ApiModel("一级项目id") + public static class FirstProject{ + @NotNull + @ApiModelProperty("一级项目id") + private Long firstProjectId; + } + @Data @ApiModel("通过组别查找本单位注册的选手") public static class QueryPlayerByGroup{ diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 4889840f..22a8500c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -52,8 +52,23 @@ public class ProvinceCompeteVo { @ApiModel("查找一级比赛项目信息") public static class FirstProject { @ApiModelProperty("一级项目id") - private Long parentProjectId; + private Long projectId; @ApiModelProperty("一级项目名字") - private String parentProjectName; + private String projectName; + } + + @Data + @ApiModel("根据一级项目id查找二级项目id") + public static class CompeteSecondProject { + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("名字") + private String name; + @ApiModelProperty("是否是团队项目 0否 1是") + private byte team; + @ApiModelProperty("最少人数") + private int memberMin; + @ApiModelProperty("最多人数") + private int memberMax; } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index cfeea0dd..91782031 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -45,4 +45,11 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @return 返回一级项目信息 */ List queryFirstProjectByCompeteTimeId(@Param("type")int type); + + /** + * 查找二级项目 + * @param firstProjectId 一级项目id + * @return 返回二级项目信息 + */ + List queryProjectByFirstProject(@Param("firstProjectId")Long firstProjectId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index c94aa184..35c06821 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -43,6 +43,14 @@ public interface IProvinceService { */ List queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId); + /** + * 查找二级项目信息 + * @param param 二级项目信息 + * @param userId userId + * @return 返回二级项目信息 + */ + List queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId); + /** * 添加或修改选手 diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index b105f197..45e79c8f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -39,8 +39,6 @@ public class ProvinceService implements IProvinceService{ @Resource private Snowflake snowflake; @Resource - private CompetePlayerMapper playerMapper; - @Resource private CompeteTimeDao competeTimeDao; /** @@ -81,6 +79,12 @@ public class ProvinceService implements IProvinceService{ return firstProjects; } + @Override + public List queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) { + List competeSecondProjects = competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId()); + return null; + } + /** * 添加或修改选手 */ diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index e67a885c..e3bf8ee4 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -110,8 +110,8 @@ + \ No newline at end of file