diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java index f823e4a3..8141d9c4 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java @@ -1,14 +1,91 @@ package com.ccsens.mt.api; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.service.ICompeteVedioService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + @Api(tags = "视频", description = "") @RestController @RequestMapping("/vedio") @Slf4j public class CompeteVedioController { + @Resource + private ICompeteVedioService iCompeteVedioService; + + @MustLogin + @ApiOperation(value = "添加用户观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，") + @RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）",params); + iCompeteVedioService.insertSignVideo(params.getParam().getCompanyId()); + return JsonResponse.newInstance().ok(); + } + @MustLogin + @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false") + @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）",params); + boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); + return JsonResponse.newInstance().ok(code); + } + + @MustLogin + @ApiOperation(value = "上传视频保存上传记录 (比赛视频)", notes = "Mr.王---------增加一条数据到competevideo") + @RequestMapping(value = "/insertVideoRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse uploadVideo(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）",params); + String path= iCompeteVedioService.uploadVideoPath(params.getParam()); + return JsonResponse.newInstance().ok(path); + } + + @MustLogin + @ApiOperation(value = "查看用户签到状态（签到用）（有筛选", notes = "Mr.王---------") + @RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selectUserStatus(@ApiParam @Validated @RequestBody QueryDto params) { + //这个没写完了 + + log.info("添加用户观看开幕式视频记录（签到用）",params); + + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "查看所有二级比赛项目", notes = "Mr.王---------去那个competeProject表下面查") + @RequestMapping(value = "/selectTwoProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto params) { + + log.info("添加用户观看开幕式视频记录（签到用）",params); + List list=iCompeteVedioService.selectTwoProject(params); + return JsonResponse.newInstance().ok(list); + + } + @MustLogin + @ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查") + @RequestMapping(value = "/selectAllCompany", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）",params); + List list=iCompeteVedioService.selectAllCompany(params); + return JsonResponse.newInstance().ok(list); + + } + + } diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index 8916de3d..9768148a 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -108,7 +108,7 @@ public class ExcelController { @MustLogin @ApiOperation(value = "xxx大赛报名表（查询）", notes = "") @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); List competeJoinList = excelService.getCompeteJoinDetail(params.getParam()); return JsonResponse.newInstance().ok(competeJoinList); diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 3e9d1ab7..af6d9117 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -305,4 +305,25 @@ public class CompeteDto { @ApiModelProperty("") private String fileBase64; } + + + @Data + @ApiModel + public static class EnterInfo{ + @NotNull + @ApiModelProperty("第几届信息的id") + private Long competeTimeId; + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("组别id") + private Long groupId; + @ApiModelProperty("团队id") + private Long companyId; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("身份证号") + private String idCard; + } + + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 12c90dbc..151a6c2e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -39,4 +39,37 @@ public class VideoDto { @ApiModelProperty("视频文件浏览路径") private String videoFileUrl; } + @Data + @ApiModel("添加用户观看开幕式视频记录（签到用）") + public static class Vdeo{ + @ApiModelProperty("视频文件id") + private Long companyId; + } + @Data + @ApiModel("上传视频保存上传记录 (比赛视频)") + public static class UploadVdeo{ + @ApiModelProperty("视频文件id") + private Long companyId; + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("项目id") + private Long competeProjectId; + @ApiModelProperty("选手参赛表Id/团队id") + private Long playerOrTeamId; + @ApiModelProperty("视频路径（云点播）") + private String videoPath; + } + @Data + @ApiModel("查看所有二级比赛项目") + public static class GetTwoProject{ + @ApiModelProperty("大赛id") + private Long teamId; + + } + @Data + @ApiModel("查找所有参赛单位") + public static class GetAllCompany{ + @ApiModelProperty("大赛id") + private Long teamId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 6892086a..d46ec52c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -32,8 +32,10 @@ public class TableVo { private int age; @ApiModelProperty("身份证号") private String idCard; - @ApiModelProperty("身份证明") - private String idCardPromise; + @ApiModelProperty("身份证明正面") + private String idCardPromiseFront; + @ApiModelProperty("身份证明背面") + private String idCardPromiseBack; @ApiModelProperty("一寸证件照") private String picture; @ApiModelProperty("学籍证明/俱乐部证明") diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java new file mode 100644 index 00000000..9130201c --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +@Data +public class VideoProjectVo { + + @Data + @ApiModel("查看所有二级比赛项目") + public static class GetTwoProject{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("项目名") + private String projectName; + } + @Data + @ApiModel("查找所有参赛单位") + public static class GetAllCompany{ + @ApiModelProperty("参赛单位id") + private Long companyId; + @ApiModelProperty("返回参赛单位名称") + private String companyName; + } + + +} diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java index 27166e46..9112c99a 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -16,4 +16,6 @@ import java.util.List; public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId); List selectDetail (); + List selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + List selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java new file mode 100644 index 00000000..78556327 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -0,0 +1,102 @@ +package com.ccsens.mt.service; + +import cn.hutool.core.lang.Snowflake; +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.po.*; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; +import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper; +import com.ccsens.mt.persist.mapper.CompeteProjectMapper; +import com.ccsens.mt.persist.mapper.CompeteVideoMapper; +import com.ccsens.util.bean.dto.QueryDto; +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 java.util.ArrayList; +import java.util.List; + +/** + * @author 10071 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class CompeteVedioService implements ICompeteVedioService{ + + @Resource + private Snowflake snowflake; + @Resource + private CompetePlayerLookMapper competePlayerLookMapper; + @Resource + private CompeteVideoMapper competeVideoMapper; + + @Resource + private CompeteProjectMapper competeProjectMapper; + @Resource + private CompeteCompanyMapper competeCompanyMapper; + + + @Override + public void insertSignVideo(Long companyId) { + CompetePlayerLook competePlayerLook=new CompetePlayerLook(); + competePlayerLook.setCompanyId(companyId); + competePlayerLook.setId(snowflake.nextId()); + competePlayerLook.setLookStatus((byte) 1); + competePlayerLook.setLookTime(System.currentTimeMillis()); + competePlayerLookMapper.insertSelective(competePlayerLook); + + } + + @Override + public boolean selectSignVideo(Long companyId) { + CompetePlayerLookExample competePlayerLookExample=new CompetePlayerLookExample(); + competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId); + List competePlayerLooks = competePlayerLookMapper.selectByExample(competePlayerLookExample); + return competePlayerLooks.size()==0? false:true; + } + + @Override + public String uploadVideoPath(VideoDto.UploadVdeo param) { + CompeteVideo competeVideo=new CompeteVideo(); + competeVideo.setId(snowflake.nextId()); + competeVideo.setCompeteTimeId(param.getCompeteTimeId()); + competeVideo.setProjectId(param.getCompeteProjectId()); + competeVideo.setPlayerId(param.getPlayerOrTeamId()); + competeVideo.setVideoUrl(param.getVideoPath()); + competeVideoMapper.insert(competeVideo); + return param.getVideoPath(); + } + + @Override + public List selectTwoProject(QueryDto params) { + CompeteProjectExample competeCompanyExample=new CompeteProjectExample(); + competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()).andLevelEqualTo((byte) 2); + List list=competeProjectMapper.selectByExample(competeCompanyExample); + List list1=new ArrayList<>(); + list.forEach(mes->{ + VideoProjectVo.GetTwoProject getTwoProject=new VideoProjectVo.GetTwoProject(); + getTwoProject.setProjectId(mes.getId()); + getTwoProject.setProjectName(mes.getName()); + list1.add(getTwoProject); + }); + return list1; + } + + @Override + public List selectAllCompany(QueryDto params) { + CompeteCompanyExample competeCompanyExample=new CompeteCompanyExample(); + competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()); + List list= competeCompanyMapper.selectByExample(competeCompanyExample); + List list1=new ArrayList<>(); + list.forEach(mes->{ + VideoProjectVo.GetAllCompany getAllCompany=new VideoProjectVo.GetAllCompany(); + getAllCompany.setCompanyId(mes.getId()); + getAllCompany.setCompanyName(mes.getName()); + list1.add(getAllCompany); + }); + return list1; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 8826350e..6e9cd59c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1,4 +1,5 @@ package com.ccsens.mt.service; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; @@ -997,7 +998,12 @@ public class ExcelService implements IExcelService { //单项时间 dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration()); //场地 - dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum()); + int siteNum = competeProjectConfig.getSiteNum(); + if(siteNum == 0){ + dailyScheduleProcess.setSiteNum(1); + }else{ + dailyScheduleProcess.setSiteNum(siteNum); + } //场次 double a = (double)count / (double)competeProjectConfig.getSiteNum(); double times = Math.ceil(a); @@ -1028,7 +1034,12 @@ public class ExcelService implements IExcelService { //单项时间 dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration()); //场地 - dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum()); + int siteNum = competeProjectConfig.getSiteNum(); + if(siteNum == 0){ + dailyScheduleProcess.setSiteNum(1); + }else{ + dailyScheduleProcess.setSiteNum(siteNum); + } //场次 double a = (double)count / (double)competeProjectConfig.getSiteNum(); double times = Math.ceil(a); @@ -1080,7 +1091,12 @@ public class ExcelService implements IExcelService { if (ObjectUtil.isNotNull(competeProjectConfig1)) { dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration()); //场地 - dailyScheduleProcess.setSiteNum(competeProjectConfig1.getSiteNum()); + int siteNum = competeProjectConfig1.getSiteNum(); + if (siteNum == 0){ + dailyScheduleProcess.setSiteNum(1); + }else { + dailyScheduleProcess.setSiteNum(siteNum); + } //场次 double a = (double) updateAndSearch.getJoinNum() /(double) competeProjectConfig1.getSiteNum(); double games = Math.ceil(a); @@ -1100,157 +1116,179 @@ public class ExcelService implements IExcelService { @Override - public List getCompeteJoinDetail(CompeteDto.CompeteTime params) { - List competeJoinList = new ArrayList<>(); - Long competeTimeId = params.getCompeteTimeId(); - CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); - int type = competeTime.getType(); - Byte level = 2; - CompeteProjectExample competeProjectExample = new CompeteProjectExample(); - competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level); - //获取参赛项目集合 - List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); - for (CompeteProject competeProject : competeProjectList) { - String projectName = competeProject.getName(); - if (competeProject.getTeam() == 0) { - //如果不是团队项目，查询该项目下报名人数集合 - CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample(); - competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); - List competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); - for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) { - //查询每个报名人的详细信息下 - CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); - TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); - //项目id - competeJoin.setProjectId(competeProject.getId()); - //姓名 - competeJoin.setName(competePlayer.getName()); - //身份证号 - competeJoin.setIdCard(competePlayer.getIdCard()); - //根据身份证获取选手年龄并赋值 - String idCard = competeJoin.getIdCard(); - int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); - competeJoin.setAge(ageByIdCard); - Byte gender = competePlayer.getGender(); - if (gender == 0) { - competeJoin.setGender("女"); - } else { - competeJoin.setGender("男"); - } - //查询单位,并赋值 - CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); - if (ObjectUtil.isNotNull(competeCompany)) { - competeJoin.setJoinTeam(competeCompany.getName()); - } - //查询组别，并赋值 - CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); - if (ObjectUtil.isNotNull(competeGroup)) { - competeJoin.setCompeteGroup(competePlayer.getName()); - } - //身份证明查询，并赋值 - CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); - if (ObjectUtil.isNotNull(commonFile)) { - competeJoin.setIdCardPromise(commonFile.getVisitLocation()); - } - //一寸证件照查询赋值 - CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile()); - if (ObjectUtil.isNotNull(commonFile1)) { - competeJoin.setPicture(commonFile1.getVisitLocation()); - } - //学籍证明/俱乐部证明 - CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); - if (ObjectUtil.isNotNull(commonFile2)) { - competeJoin.setStudentPromise(commonFile2.getVisitLocation()); - } - //体检证明 - CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); - if (ObjectUtil.isNotNull(commonFile3)) { - competeJoin.setBodyTest(commonFile3.getVisitLocation()); - } - //人身意外伤害保险证明 - CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); - if (ObjectUtil.isNotNull(commonFile4)) { - competeJoin.setBodyProtect(commonFile4.getVisitLocation()); - } - //参赛项目名赋值 - competeJoin.setCompeteProject(projectName); - competeJoinList.add(competeJoin); - } + public List getCompeteJoinDetail(CompeteDto.EnterInfo params) { + List competeJoinList = new ArrayList<>(); + //个人项目查询 + List competeJoinList1 = competeProjectConfigDao.selectSingle(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); + for (TableVo.CompeteJoin competeJoin : competeJoinList1){ + //获取身份证 + String idCard = competeJoin.getIdCard(); + //根据身份证获取选手年龄并赋值 + int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); + competeJoin.setAge(ageByIdCard); + competeJoinList.add(competeJoin); + } + //团队项目查询 + List competeJoinList2 = competeProjectConfigDao.selectGroup(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); + for (TableVo.CompeteJoin competeJoin : competeJoinList2){ + //获取身份证 + String idCard = competeJoin.getIdCard(); + //根据身份证获取选手年龄并赋值 + int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); + competeJoin.setAge(ageByIdCard); + competeJoinList.add(competeJoin); + } +// Long competeTimeId = params.getCompeteTimeId(); +// CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); +// int type = competeTime.getType(); +// Byte level = 2; +// CompeteProjectExample competeProjectExample = new CompeteProjectExample(); +// competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level); +// //获取参赛项目集合 +// List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); +// for (CompeteProject competeProject : competeProjectList) { +// String projectName = competeProject.getName(); +// if (competeProject.getTeam() == 0) { +// //如果不是团队项目，查询该项目下报名人数集合 +// CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample(); +// competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); +// List competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); +// for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) { +// //查询每个报名人的详细信息下 +// CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); +// TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); +// //项目id +// competeJoin.setProjectId(competeProject.getId()); +// //姓名 +// competeJoin.setName(competePlayer.getName()); +// //身份证号 +// competeJoin.setIdCard(competePlayer.getIdCard()); +// //根据身份证获取选手年龄并赋值 +// String idCard = competeJoin.getIdCard(); +// int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); +// competeJoin.setAge(ageByIdCard); +// Byte gender = competePlayer.getGender(); +// if (gender == 0) { +// competeJoin.setGender("女"); +// } else { +// competeJoin.setGender("男"); +// } +// //查询单位,并赋值 +// CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); +// if (ObjectUtil.isNotNull(competeCompany)) { +// competeJoin.setJoinTeam(competeCompany.getName()); +// } +// //查询组别，并赋值 +// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); +// if (ObjectUtil.isNotNull(competeGroup)) { +// competeJoin.setCompeteGroup(competePlayer.getName()); +// } +// //身份证明查询，并赋值 +// CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); +// if (ObjectUtil.isNotNull(commonFile)) { +// competeJoin.setIdCardPromise(commonFile.getVisitLocation()); +// } +// //一寸证件照查询赋值 +// CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile()); +// if (ObjectUtil.isNotNull(commonFile1)) { +// competeJoin.setPicture(commonFile1.getVisitLocation()); +// } +// //学籍证明/俱乐部证明 +// CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); +// if (ObjectUtil.isNotNull(commonFile2)) { +// competeJoin.setStudentPromise(commonFile2.getVisitLocation()); +// } +// //体检证明 +// CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); +// if (ObjectUtil.isNotNull(commonFile3)) { +// competeJoin.setBodyTest(commonFile3.getVisitLocation()); +// } +// //人身意外伤害保险证明 +// CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); +// if (ObjectUtil.isNotNull(commonFile4)) { +// competeJoin.setBodyProtect(commonFile4.getVisitLocation()); +// } +// //参赛项目名赋值 +// competeJoin.setCompeteProject(projectName); +// competeJoinList.add(competeJoin); +// } +// +// } else { //团队项目 +// //获取参赛队伍集合 +// CompeteTeamExample competeTeamExample = new CompeteTeamExample(); +// competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); +// List competeTeamList = competeTeamDao.selectByExample(competeTeamExample); +// for (CompeteTeam competeTeam : competeTeamList) { +// //获取队伍下的成员集合 +// CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample(); +// competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); +// List competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); +// for (CompeteTeamMember competeTeamMember : competeTeamMemberList) { +// //查询成员详细信息 +// CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()); +// TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); +// //项目id +// competeJoin.setProjectId(competeProject.getId()); +// //姓名 +// competeJoin.setName(competePlayer.getName()); +// //身份证号 +// competeJoin.setIdCard(competePlayer.getIdCard()); +// //根据身份证获取选手年龄并赋值 +// String idCard = competeJoin.getIdCard(); +// int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); +// competeJoin.setAge(ageByIdCard); +// //性别 +// Byte gender = competePlayer.getGender(); +// if (gender == 0) { +// competeJoin.setGender("女"); +// } else { +// competeJoin.setGender("男"); +// } +// //查询单位,并赋值 +// CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); +// if (ObjectUtil.isNotNull(competeCompany)) { +// competeJoin.setJoinTeam(competeCompany.getName()); +// } +// //查询组别，并赋值 +// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); +// if (ObjectUtil.isNotNull(competeGroup)) { +// competeJoin.setCompeteGroup(competePlayer.getName()); +// } +// //身份证明查询，并赋值 +// CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); +// if (ObjectUtil.isNotNull(commonFile)){ +// competeJoin.setIdCardPromise(commonFile.getVisitLocation()); +// } +// //一寸证件照查询赋值 +// CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile()); +// if (ObjectUtil.isNotNull(commonFile1)){ +// competeJoin.setPicture(commonFile1.getVisitLocation()); +// } +// //学籍证明/俱乐部证明 +// CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); +// if (ObjectUtil.isNotNull(commonFile2)){ +// competeJoin.setStudentPromise(commonFile2.getVisitLocation()); +// } +// //体检证明 +// CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); +// if (ObjectUtil.isNotNull(commonFile3)){ +// competeJoin.setBodyTest(commonFile3.getVisitLocation()); +// } +// //人身意外伤害保险证明 +// CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); +// if (ObjectUtil.isNotNull(commonFile4)){ +// competeJoin.setBodyProtect(commonFile4.getVisitLocation()); +// } +// //参赛项目名赋值 +// competeJoin.setCompeteProject(projectName); +// competeJoinList.add(competeJoin); +// } +// } +// } +// } +// return competeJoinList; - } else { //团队项目 - //获取参赛队伍集合 - CompeteTeamExample competeTeamExample = new CompeteTeamExample(); - competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); - List competeTeamList = competeTeamDao.selectByExample(competeTeamExample); - for (CompeteTeam competeTeam : competeTeamList) { - //获取队伍下的成员集合 - CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample(); - competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); - List competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); - for (CompeteTeamMember competeTeamMember : competeTeamMemberList) { - //查询成员详细信息 - CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()); - TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); - //项目id - competeJoin.setProjectId(competeProject.getId()); - //姓名 - competeJoin.setName(competePlayer.getName()); - //身份证号 - competeJoin.setIdCard(competePlayer.getIdCard()); - //根据身份证获取选手年龄并赋值 - String idCard = competeJoin.getIdCard(); - int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); - competeJoin.setAge(ageByIdCard); - //性别 - Byte gender = competePlayer.getGender(); - if (gender == 0) { - competeJoin.setGender("女"); - } else { - competeJoin.setGender("男"); - } - //查询单位,并赋值 - CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); - if (ObjectUtil.isNotNull(competeCompany)) { - competeJoin.setJoinTeam(competeCompany.getName()); - } - //查询组别，并赋值 - CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); - if (ObjectUtil.isNotNull(competeGroup)) { - competeJoin.setCompeteGroup(competePlayer.getName()); - } - //身份证明查询，并赋值 - CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); - if (ObjectUtil.isNotNull(commonFile)){ - competeJoin.setIdCardPromise(commonFile.getVisitLocation()); - } - //一寸证件照查询赋值 - CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile()); - if (ObjectUtil.isNotNull(commonFile1)){ - competeJoin.setPicture(commonFile1.getVisitLocation()); - } - //学籍证明/俱乐部证明 - CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); - if (ObjectUtil.isNotNull(commonFile2)){ - competeJoin.setStudentPromise(commonFile2.getVisitLocation()); - } - //体检证明 - CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); - if (ObjectUtil.isNotNull(commonFile3)){ - competeJoin.setBodyTest(commonFile3.getVisitLocation()); - } - //人身意外伤害保险证明 - CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); - if (ObjectUtil.isNotNull(commonFile4)){ - competeJoin.setBodyProtect(commonFile4.getVisitLocation()); - } - //参赛项目名赋值 - competeJoin.setCompeteProject(projectName); - competeJoinList.add(competeJoin); - } - } - } - } - return competeJoinList; + return competeJoinList; } @Override @@ -1258,45 +1296,46 @@ public class ExcelService implements IExcelService { List schedulePlanDetailListUp = new ArrayList<>(); List schedulePlanDetailListDown = new ArrayList<>(); //关联查询项目名，该项目在config和project中都存在 - List schedulePlanDetailList = competeProjectConfigDao.selectDetail(); - for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList){ - //项目名 - String projectName = schedulePlanDetail.getProjectName(); - //开始时间yyyy-MM-dd HH:mm:ss - long startTime = schedulePlanDetail.getStartTime(); - Date date = new Date(startTime); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); - String sm = simpleDateFormat.format(date); - //结束时间 - long endTime = schedulePlanDetail.getEndTime(); - Date date1 = new Date(endTime); - SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); - String em = simpleDateFormat1.format(date1); - //拼接 - String string = projectName + "("+ sm +"-"+ em + ")"; - //项目开始日期 - SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd"); - String md = simpleDateFormat2.format(date); - //上午项目 - if (Integer.parseInt(sm.substring(0,2)) >= 6 && Integer.parseInt(sm.substring(0,2)) <= 12){ - TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn(); - schedulePlanDetailAllIn.setData(md); - schedulePlanDetailAllIn.setString(string); - schedulePlanDetailListUp.add(schedulePlanDetailAllIn); - }//下午项目 - else if (Integer.parseInt(sm.substring(0,2)) > 12 && Integer.parseInt(sm.substring(0,2)) <= 18){ - TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn(); - schedulePlanDetailAllIn1.setData(md); - schedulePlanDetailAllIn1.setString(string); - schedulePlanDetailListDown.add(schedulePlanDetailAllIn1); + List schedulePlanDetailList = competeProjectConfigDao.selectDetail(); + TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan(); + if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) { + for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) { + //项目名 + String projectName = schedulePlanDetail.getProjectName(); + //开始时间yyyy-MM-dd HH:mm:ss + long startTime = schedulePlanDetail.getStartTime(); + Date date = new Date(startTime); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String sm = simpleDateFormat.format(date); + //结束时间 + long endTime = schedulePlanDetail.getEndTime(); + Date date1 = new Date(endTime); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String em = simpleDateFormat1.format(date1); + //拼接 + String string = projectName + "(" + sm + "-" + em + ")"; + //项目开始日期 + SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd"); + String md = simpleDateFormat2.format(date); + //上午项目 + if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) { + TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn(); + schedulePlanDetailAllIn.setData(md); + schedulePlanDetailAllIn.setString(string); + schedulePlanDetailListUp.add(schedulePlanDetailAllIn); + }//下午项目 + else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) { + TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn(); + schedulePlanDetailAllIn1.setData(md); + schedulePlanDetailAllIn1.setString(string); + schedulePlanDetailListDown.add(schedulePlanDetailAllIn1); + } } + + schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown); + schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp); } - TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan(); - schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown); - schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp); return schedulePlan; } - - } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java new file mode 100644 index 00000000..3cc76419 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.service; + +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.po.CompetePlayerLook; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.util.bean.dto.QueryDto; + +import java.util.List; + +public interface ICompeteVedioService { + /** + * + * 添加用户观看开幕式视频记录（签到用） + * @param companyId 单位id + */ + void insertSignVideo(Long companyId); + + /** + * 查看用户观看视频记录（签到用） + * @param companyId + * + */ + boolean selectSignVideo(Long companyId); + + String uploadVideoPath(VideoDto.UploadVdeo param); + + List selectTwoProject(QueryDto params); + + List selectAllCompany(QueryDto params); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java index 514a6569..b941bda3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -42,7 +42,7 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - List getCompeteJoinDetail(CompeteDto.CompeteTime params); + List getCompeteJoinDetail(CompeteDto.EnterInfo params); /** diff --git a/mt/src/main/java/com/ccsens/mt/service/VideoService.java b/mt/src/main/java/com/ccsens/mt/service/VideoService.java index c732fe98..fe8afc77 100644 --- a/mt/src/main/java/com/ccsens/mt/service/VideoService.java +++ b/mt/src/main/java/com/ccsens/mt/service/VideoService.java @@ -30,6 +30,7 @@ public class VideoService implements IVideoService{ @Resource private CompeteVideoMapper competeVideoMapper; + /** * 查看某个用户上传的比赛视频信息 * @param params 比赛id和选手id diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,5 @@ spring: profiles: active: test - include: common, util-test \ No newline at end of file + include: common, util-test + diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index a7bd62b3..d8c89a2d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -24,4 +24,101 @@ FROM t_compete_project_config a , t_compete_project b where a.project_id = b.id + + + + \ No newline at end of file diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee0a41b5..ee29058b 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7030 + port: 7070 servlet: context-path: /v1.0 spring: