From d36bc3c2b69c682ca9f4bc756bbf898376e49ddd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 15:46:21 +0800 Subject: [PATCH 1/8] 20201121v1.7 --- .../ccsens/mt/service/CompeteTaskService.java | 325 +++++++++--------- 1 file changed, 163 insertions(+), 162 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 9c8bee58..b5d4a6d5 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -132,6 +132,7 @@ public class CompeteTaskService implements ICompeteTaskService{ CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId()); List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); +// List projectPlayerIdList = competeProjectDao.queryJoinNum(project.getId()); if (CollectionUtil.isNotEmpty(projectPlayerList)) { //计算场次 int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); @@ -158,43 +159,43 @@ public class CompeteTaskService implements ICompeteTaskService{ if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); - // 修改tall的任务 - TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); - updateTaskInfo.setId(competeStartOrder.getId()); - updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); - updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); - updateTaskInfo.setToken(token); - log.info("修改tall的任务信息：{}",updateTaskInfo); - JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); - log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); - //失败return - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ - return; - } +// // 修改tall的任务 +// TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); +// updateTaskInfo.setId(competeStartOrder.getId()); +// updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); +// updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); +// updateTaskInfo.setToken(token); +// log.info("修改tall的任务信息：{}",updateTaskInfo); +// JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); +// log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); +// //失败return +// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ +// return; +// } } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); }else{ - //添加tall的任务 - Long taskId = null; - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + competeOrder +"-" + site); - addTask.setBeginTime(projectStartTime); - addTask.setEndTime(projectStartTime + orderTime); - addTask.setExecutorId(tallRoleId); - addTask.setToken(token); - log.info("在tall内添加任务：{}",addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - //异常return - log.info("添加任务后返回：{}",normalTaskJsonResponse); - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { - return; - } - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - taskId = normalTask.getDetailId(); - } +// //添加tall的任务 +// Long taskId = null; +// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); +// addTask.setProjectId(tallProjectId); +// addTask.setTaskName(project.getName() + competeOrder +"-" + site); +// addTask.setBeginTime(projectStartTime); +// addTask.setEndTime(projectStartTime + orderTime); +// addTask.setExecutorId(tallRoleId); +// addTask.setToken(token); +// log.info("在tall内添加任务：{}",addTask); +// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); +// //异常return +// log.info("添加任务后返回：{}",normalTaskJsonResponse); +// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { +// return; +// } +// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); +// if (ObjectUtil.isNotNull(normalTask)) { +// taskId = normalTask.getDetailId(); +// } //添加出场顺序信息 CompeteStartOrder competeStartOrder = new CompeteStartOrder(); competeStartOrder.setId(snowflake.nextId()); @@ -245,44 +246,44 @@ public class CompeteTaskService implements ICompeteTaskService{ if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); - //修改tall的任务 - TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); - updateTaskInfo.setId(competeStartOrder.getId()); - updateTaskInfo.setBeginTime(competeStartOrder.getId()); - updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); - updateTaskInfo.setToken(token); - log.info("修改tall的任务信息：{}",updateTaskInfo); - JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); - log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); - //失败return - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ - return; - } +// //修改tall的任务 +// TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); +// updateTaskInfo.setId(competeStartOrder.getId()); +// updateTaskInfo.setBeginTime(competeStartOrder.getId()); +// updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); +// updateTaskInfo.setToken(token); +// log.info("修改tall的任务信息：{}",updateTaskInfo); +// JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); +// log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); +// //失败return +// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ +// return; +// } } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); }else{ - //添加tall的任务 - Long taskId = null; - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + competeOrder +"-" + site); - addTask.setBeginTime(projectStartTime); - addTask.setEndTime(projectStartTime + orderTime); - addTask.setExecutorId(tallRoleId); - addTask.setToken(token); - log.info("在tall内添加任务：{}",addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - log.info("添加任务后返回：{}",normalTaskJsonResponse); - //异常return - log.info("添加任务后返回：{}",normalTaskJsonResponse); - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { - return; - } - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - taskId = normalTask.getDetailId(); - } +// //添加tall的任务 +// Long taskId = null; +// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); +// addTask.setProjectId(tallProjectId); +// addTask.setTaskName(project.getName() + competeOrder +"-" + site); +// addTask.setBeginTime(projectStartTime); +// addTask.setEndTime(projectStartTime + orderTime); +// addTask.setExecutorId(tallRoleId); +// addTask.setToken(token); +// log.info("在tall内添加任务：{}",addTask); +// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); +// log.info("添加任务后返回：{}",normalTaskJsonResponse); +// //异常return +// log.info("添加任务后返回：{}",normalTaskJsonResponse); +// if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { +// return; +// } +// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); +// if (ObjectUtil.isNotNull(normalTask)) { +// taskId = normalTask.getDetailId(); +// } //添加出场顺序信息 CompeteStartOrder competeStartOrder = new CompeteStartOrder(); competeStartOrder.setId(snowflake.nextId()); @@ -422,101 +423,101 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); - - - //添加角色 - MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); - saveRole.setProjectId(tallProjectId); - String jdgmentNum = ""; - if (judgmentInfo.getJudgmentNum() == 0) { - jdgmentNum = "主裁判"; - } else { - jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); - } - saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); - Long roleId = null; - saveRole.setToken(token); - log.info("在tall内添加角色：{}", saveRole); - JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); - log.info("添加角色后返回：{}", roleJsonResponse); - if (ObjectUtil.isNotNull(roleJsonResponse)) { - MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); - if (ObjectUtil.isNotNull(roleInfo)) { - roleId = roleInfo.getRoleId(); - } - } - //添加成员 - MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); - saveMember.setMemberName(judgmentInfo.getJudgmentName()); - saveMember.setProjectId(tallProjectId); - saveMember.setPhone(judgmentInfo.getJudgmentPhone()); - saveMember.setRoleId(Arrays.asList(roleId)); - saveMember.setToken(token); - log.info("在tall内添加成员：{}", saveMember); - JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); - log.info("添加成员后返回：{}", memberJsonResponse); - //如果成员已存在，查询成员信息然后添加至角色内 - Long memberId = null; - if (ObjectUtil.isNotNull(memberJsonResponse)) { - //code等于21代表成员已存在 - if(memberJsonResponse.getCode() == 21){ - //查询该手机号在项目内的成员的id - MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); - getMemberByPhone.setProjectId(tallProjectId); - getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); - getMemberByPhone.setToken(token); - JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); - if (ObjectUtil.isNotNull(memberListJsonResponse)) { - MemberVo.MemberList memberList = memberListJsonResponse.getData(); - if (ObjectUtil.isNotNull(memberList)) { - memberId = memberList.getMemberId(); - } - } - //将该成员添加至角色下 - if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ - MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); - saveMemberInRole.setRoleId(roleId); - saveMemberInRole.setMemberId(memberId); - saveMemberInRole.setToken(token); - tallFeignClient.saveMemberInRole(saveMemberInRole); - } - } - } - //添加任务 - //查找场次信息表 - CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); - startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) - .andSiteEqualTo((byte) siteJudgment.getSite()); - List startOrderList = startOrderMapper.selectByExample(startOrderExample); - if (CollectionUtil.isNotEmpty(startOrderList)) { - for (CompeteStartOrder startOrder : startOrderList) { - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" - + startOrder.getSite() + "-" + jdgmentNum); - addTask.setBeginTime(startOrder.getStartTime()); - addTask.setEndTime(startOrder.getEndTime()); - addTask.setExecutorId(roleId); - addTask.setParentTaskId(startOrder.getTaskId()); - addTask.setToken(token); - log.info("在tall内添加任务：{}", addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - log.info("添加任务后返回：{}", normalTaskJsonResponse); - if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - //修改任务插件配置信息 - TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); - updatePluginConfig.setWebPath("/home/osct/video-score"); - updatePluginConfig.setTaskId(normalTask.getDetailId()); - updatePluginConfig.setToken(token); - log.info("修改tall内任务插件配置：{}", updatePluginConfig); - JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); - log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); - } - } - } - } +// +// +// //添加角色 +// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); +// saveRole.setProjectId(tallProjectId); +// String jdgmentNum = ""; +// if (judgmentInfo.getJudgmentNum() == 0) { +// jdgmentNum = "主裁判"; +// } else { +// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); +// } +// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); +// Long roleId = null; +// saveRole.setToken(token); +// log.info("在tall内添加角色：{}", saveRole); +// JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); +// log.info("添加角色后返回：{}", roleJsonResponse); +// if (ObjectUtil.isNotNull(roleJsonResponse)) { +// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); +// if (ObjectUtil.isNotNull(roleInfo)) { +// roleId = roleInfo.getRoleId(); +// } +// } +// //添加成员 +// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); +// saveMember.setMemberName(judgmentInfo.getJudgmentName()); +// saveMember.setProjectId(tallProjectId); +// saveMember.setPhone(judgmentInfo.getJudgmentPhone()); +// saveMember.setRoleId(Arrays.asList(roleId)); +// saveMember.setToken(token); +// log.info("在tall内添加成员：{}", saveMember); +// JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); +// log.info("添加成员后返回：{}", memberJsonResponse); +// //如果成员已存在，查询成员信息然后添加至角色内 +// Long memberId = null; +// if (ObjectUtil.isNotNull(memberJsonResponse)) { +// //code等于21代表成员已存在 +// if(memberJsonResponse.getCode() == 21){ +// //查询该手机号在项目内的成员的id +// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); +// getMemberByPhone.setProjectId(tallProjectId); +// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); +// getMemberByPhone.setToken(token); +// JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); +// if (ObjectUtil.isNotNull(memberListJsonResponse)) { +// MemberVo.MemberList memberList = memberListJsonResponse.getData(); +// if (ObjectUtil.isNotNull(memberList)) { +// memberId = memberList.getMemberId(); +// } +// } +// //将该成员添加至角色下 +// if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ +// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); +// saveMemberInRole.setRoleId(roleId); +// saveMemberInRole.setMemberId(memberId); +// saveMemberInRole.setToken(token); +// tallFeignClient.saveMemberInRole(saveMemberInRole); +// } +// } +// } +// //添加任务 +// //查找场次信息表 +// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); +// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) +// .andSiteEqualTo((byte) siteJudgment.getSite()); +// List startOrderList = startOrderMapper.selectByExample(startOrderExample); +// if (CollectionUtil.isNotEmpty(startOrderList)) { +// for (CompeteStartOrder startOrder : startOrderList) { +// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); +// addTask.setProjectId(tallProjectId); +// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" +// + startOrder.getSite() + "-" + jdgmentNum); +// addTask.setBeginTime(startOrder.getStartTime()); +// addTask.setEndTime(startOrder.getEndTime()); +// addTask.setExecutorId(roleId); +// addTask.setParentTaskId(startOrder.getTaskId()); +// addTask.setToken(token); +// log.info("在tall内添加任务：{}", addTask); +// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); +// log.info("添加任务后返回：{}", normalTaskJsonResponse); +// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { +// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); +// if (ObjectUtil.isNotNull(normalTask)) { +// //修改任务插件配置信息 +// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); +// updatePluginConfig.setWebPath("/home/osct/video-score"); +// updatePluginConfig.setTaskId(normalTask.getDetailId()); +// updatePluginConfig.setToken(token); +// log.info("修改tall内任务插件配置：{}", updatePluginConfig); +// JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); +// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); +// } +// } +// } +// } } } From 01b09af72a93233189d9dcfe11a1e63dcc5cd8c5 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Sat, 21 Nov 2020 16:01:09 +0800 Subject: [PATCH 2/8] 11-21-2 --- .../ccsens/mt/api/CompeteScoreController.java | 5 +- .../com/ccsens/mt/api/ExcelController.java | 3 +- .../com/ccsens/mt/bean/dto/CompeteDto.java | 4 + .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 4 + .../mt/persist/dao/CompeteScoreDao.java | 3 + .../com/ccsens/mt/service/CompeteService.java | 142 ++++++++++++++++-- .../com/ccsens/mt/service/ExcelService.java | 4 +- .../ccsens/mt/service/ICompeteService.java | 5 +- .../com/ccsens/mt/service/IExcelService.java | 3 +- .../resources/mapper_dao/CompeteScoreDao.xml | 58 +++++++ 10 files changed, 210 insertions(+), 21 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 86c916d2..9bb5a171 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -8,6 +8,7 @@ import com.ccsens.mt.bean.vo.ScoreVo; import com.ccsens.mt.service.ICompeteService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; @@ -105,7 +106,7 @@ public class CompeteScoreController { @RequestMapping(value = "/query/countScoreAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryCountScoreAll(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看计数赛成绩公示表：{}",params); - List countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam()); + PageInfo countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam()); log.info("查看计数赛成绩公示表：{}",params); return JsonResponse.newInstance().ok(countScoreCurrentSites); } @@ -124,7 +125,7 @@ public class CompeteScoreController { @RequestMapping(value = "/speedPass", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse speedPass(@ApiParam @Validated @RequestBody QueryDto params) { log.info("速度通级赛：{}",params); - List speedPassList = competeService.speedPass(params.getParam()); + PageInfo speedPassList = competeService.speedPass(params.getParam()); return JsonResponse.newInstance().ok(speedPassList); } 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 2e8eb55b..753a01c7 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -9,6 +9,7 @@ import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.IExcelService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -111,7 +112,7 @@ public class ExcelController { @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - List competeJoinList = excelService.getCompeteJoinDetail(params.getParam()); + PageInfo 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 6773268c..b00bc7ee 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 @@ -379,6 +379,10 @@ public class CompeteDto { @NotNull @ApiModelProperty("项目id") private Long projectId; + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 792354bd..2b23b8bb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -129,6 +129,10 @@ public class ScoreDto { @NotNull @ApiModelProperty("项目id") private Long projectId; + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; } @Data @ApiModel diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index 372d2f10..74d3ac81 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -24,6 +24,9 @@ public interface CompeteScoreDao { List selectCountScoreCurrentSite (@Param("siteId") long siteId); List selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId); + List selectQueryCountScore(@Param("projectId")Long projectId); + + diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index bb13ed4a..bab3d421 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -22,6 +22,8 @@ import com.ccsens.mt.util.Constant; import com.ccsens.util.*; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -1345,10 +1347,12 @@ public class CompeteService implements ICompeteService { @Override - public List speedPass(CompeteDto.CompeteTimeAndProjectId params) { + public PageInfo speedPass(CompeteDto.CompeteTimeAndProjectId params) { long projectId = params.getProjectId(); long competeTimeId = params.getCompeteTimeId(); + PageHelper.startPage(params.getPage(),params.getSize()); List speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); + PageInfo pageInfo = new PageInfo<>(speedPassList); if (CollectionUtil.isNotEmpty(speedPassList)) { for (CompeteVo.SpeedPass mes : speedPassList) { //查30s单摇跳得分 @@ -1450,23 +1454,135 @@ public class CompeteService implements ICompeteService { } } } - return speedPassList; + return pageInfo; } + public List speedPassCha(CompeteDto.CompeteTimeAndProjectId params) { + long projectId = params.getProjectId(); + long competeTimeId = params.getCompeteTimeId(); + PageHelper.startPage(params.getPage(),params.getSize()); + List speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); + PageInfo pageInfo = new PageInfo<>(speedPassList); + if (CollectionUtil.isNotEmpty(speedPassList)) { + for (CompeteVo.SpeedPass mes : speedPassList) { + //查30s单摇跳得分 + CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders.size() > 0) { + CompeteStartOrder competeStartOrder = competeStartOrders.get(0); + long id = competeStartOrder.getId(); + CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); + competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id); + List competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample); + CompeteCountScore competeCountScore = competeCountScoreList.get(0); + BigDecimal score = competeCountScore.getFinalScore(); + BigDecimal bigDecimal = new BigDecimal(2); + BigDecimal secondTimeScore = score.multiply(bigDecimal); + //查30s单摇跳得分 * 2 =次数 + mes.setSecondTime(secondTimeScore); + } + //3分钟单摇跳得分 + CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders1.size() > 0) { + CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0); + long id1 = competeStartOrder1.getId(); + CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample(); + competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1); + List competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1); + CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0); + BigDecimal score1 = competeCountScore1.getFinalScore(); + BigDecimal bigDecimal1 = new BigDecimal(2); + BigDecimal minuteTimeScore = score1.multiply(bigDecimal1); + //3分钟单摇跳得分 * 2 =次数 + mes.setMinuteTime(minuteTimeScore); + } + BigDecimal bigDecimal0 = new BigDecimal(70); + BigDecimal bigDecimal2 = new BigDecimal(90); + BigDecimal bigDecimal3 = new BigDecimal(105); + BigDecimal bigDecimal4 = new BigDecimal(120); + BigDecimal bigDecimal5 = new BigDecimal(130); + BigDecimal bigDecimal6 = new BigDecimal(140); + BigDecimal bigDecimal7 = new BigDecimal(300); + BigDecimal bigDecimal8 = new BigDecimal(380); + BigDecimal bigDecimal9 = new BigDecimal(460); + BigDecimal bigDecimal10 = new BigDecimal(540); + BigDecimal bigDecimal11 = new BigDecimal(620); + BigDecimal bigDecimal12 = new BigDecimal(700); + BigDecimal s =mes.getSecondTime(); + if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) { + //判断30s单摇跳等级 + if (mes.getSecondTime().compareTo(bigDecimal0) < 1) { + mes.setSecondGrade(1); + } + if (mes.getSecondTime().compareTo(bigDecimal2) < 1) { + mes.setSecondGrade(2); + } + if (mes.getSecondTime().compareTo(bigDecimal3) < 1) { + mes.setSecondGrade(3); + } + if (mes.getSecondTime().compareTo(bigDecimal4) < 1) { + mes.setSecondGrade(4); + } + if (mes.getSecondTime().compareTo(bigDecimal5) < 1) { + mes.setSecondGrade(5); + } + if (mes.getSecondTime().compareTo(bigDecimal6) < 1) { + mes.setSecondGrade(6); + } + //判断3分钟单摇跳等级 + if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) { + mes.setMinuteGrade(1); + } + if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) { + mes.setMinuteGrade(2); + } + + if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) { + mes.setMinuteGrade(3); + } + if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) { + mes.setMinuteGrade(4); + } - @Override - public List queryCountScoreAll(ScoreDto.ShowResult param) { - List countScoreCurrentSiteList = new ArrayList<>(); - CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); - if(ObjectUtil.isNotNull(competeProject)) { - if(competeProject.getTeam() == 0) { - countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId()); - }else { - countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId()); + if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) { + mes.setMinuteGrade(5); + } + + if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) { + mes.setMinuteGrade(6); + } + //如果30s得等级小于等于3分钟得等级 + if (mes.getSecondGrade() <= mes.getMinuteGrade()) { + mes.setGrade(mes.getSecondGrade()); + } else { + mes.setGrade(mes.getMinuteGrade()); + } + } } } - return countScoreCurrentSiteList; + return speedPassList; + } + + @Override + public PageInfo queryCountScoreAll(ScoreDto.ShowResult params) { + PageHelper.startPage(params.getPage(),params.getSize()); + List countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId()); + PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites); +// List countScoreCurrentSiteList = new ArrayList<>(); +// CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + +// if(ObjectUtil.isNotNull(competeProject)) { +// if(competeProject.getTeam() == 0) { +// countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId()); +// }else { +// countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId()); +// } +// } + return pageInfo; } @Override @@ -1598,7 +1714,7 @@ public class CompeteService implements ICompeteService { @Override public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException { - List speedPasses = speedPass(params); + List speedPasses = speedPassCha(params); String path = getExcelFilePathForspeedPassOut(speedPasses); return path; } 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 ebc39bdf..e34a6c1c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1150,7 +1150,7 @@ public class ExcelService implements IExcelService { @Override - public List getCompeteJoinDetail(CompeteDto.EnterInfo params) { + public PageInfo getCompeteJoinDetail(CompeteDto.EnterInfo params) { // List competeJoinList = new ArrayList<>(); // 个人项目查询 // PageHelper.startPage(params.getPage(),params.getSize()); @@ -1167,7 +1167,7 @@ public class ExcelService implements IExcelService { PageHelper.startPage(params.getPage(),params.getSize()); List competeJoinList = competeProjectConfigDao.selectPeople(params.getProjectId(), params.getGroupId(), params.getCompanyId(), params.getName(), params.getIdCard()); PageInfo pageInfo = new PageInfo<>(competeJoinList); - return competeJoinList; + return pageInfo; } @Override diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 8ca886bc..efd836b6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -5,6 +5,7 @@ import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ScoreVo; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import java.io.FileNotFoundException; import java.io.IOException; @@ -193,7 +194,7 @@ public interface ICompeteService { * @param params 项目id和场次id * @return 返回项目，开始时间和比赛状态 */ - List speedPass(CompeteDto.CompeteTimeAndProjectId params); + PageInfo speedPass(CompeteDto.CompeteTimeAndProjectId params); /** @@ -209,7 +210,7 @@ public interface ICompeteService { @param param @return */ - List queryCountScoreAll(ScoreDto.ShowResult param); + PageInfo queryCountScoreAll(ScoreDto.ShowResult param); CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param); 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 fe8b8316..d6606951 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -7,6 +7,7 @@ import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import java.io.IOException; import java.util.List; @@ -43,7 +44,7 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - List getCompeteJoinDetail(CompeteDto.EnterInfo params); + PageInfo getCompeteJoinDetail(CompeteDto.EnterInfo params); /** diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 88dcc793..54df5d89 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -104,6 +104,64 @@ and tccs.rec_status =0 and tcso.id =#{siteId} + + + + + + + + \ No newline at end of file From b457ad83c1635bf56aef63e7694fa3f4330e4dae Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 16:26:16 +0800 Subject: [PATCH 5/8] 20201121v1.8 --- .../resources/mapper_dao/CompeteProjectConfigDao.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index d9006c30..34388a0a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -52,7 +52,7 @@ \ No newline at end of file From 41603646c49784ec8e3d9c0fc9ff351f01b0c2ab Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 19:18:59 +0800 Subject: [PATCH 8/8] 20201121v2.0 --- .../ccsens/mt/service/CompeteTaskService.java | 215 +++++++++--------- mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectDao.xml | 4 +- 3 files changed, 112 insertions(+), 111 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 54f4f335..5c7e7f98 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Slf4j @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) -public class CompeteTaskService implements ICompeteTaskService{ +public class CompeteTaskService implements ICompeteTaskService { @Resource private CompeteProjectConfigDao projectConfigDao; @Resource @@ -62,7 +62,7 @@ public class CompeteTaskService implements ICompeteTaskService{ public List queryCompeteConfig(CompeteDto.CompeteTime param) { CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); List competeProjectConfigList = new ArrayList<>(); - if(ObjectUtil.isNotNull(competeTime)) { + if (ObjectUtil.isNotNull(competeTime)) { competeProjectConfigList = projectConfigDao.queryProjectConfig(competeTime.getType()); } return competeProjectConfigList; @@ -72,77 +72,78 @@ public class CompeteTaskService implements ICompeteTaskService{ * 修改项目的日程配置 */ @Override - public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token) { + public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param, String token) { //获取比赛类型 AtomicInteger type = new AtomicInteger(); - if(CollectionUtil.isEmpty(param.getUpdateCompeteTaskList())) { + if (CollectionUtil.isEmpty(param.getUpdateCompeteTaskList())) { return new ArrayList<>(); } - param.getUpdateCompeteTaskList().forEach(projectConfig -> { - //判断时间和时长是否正确 - if(ObjectUtil.isNull(projectConfig.getStartTime()) || projectConfig.getStartTime() == 0 - || ObjectUtil.isNull(projectConfig.getEndTime()) || projectConfig.getEndTime() == 0 || - ObjectUtil.isNull(projectConfig.getDuration()) || projectConfig.getDuration() == 0){ - return; - } - //获取项目 - CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); - if(ObjectUtil.isNotNull(project)){ - type.set(project.getType()); - } - CompeteProjectConfig competeProjectConfig; - CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample(); - projectConfigExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); - List projectConfigList = projectConfigDao.selectByExample(projectConfigExample); - log.info("查找项目配置信息：{}",projectConfigList); - if(CollectionUtil.isNotEmpty(projectConfigList)){ - //有则修改 - competeProjectConfig = projectConfigList.get(0); - competeProjectConfig.setProjectDuration(projectConfig.getDuration()); - competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); - competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); - competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); - projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); - log.info("修改比赛日程配置：{}",competeProjectConfig); - }else { - //没有则添加 - competeProjectConfig = new CompeteProjectConfig(); - competeProjectConfig.setId(snowflake.nextId()); - competeProjectConfig.setProjectId(projectConfig.getProjectId()); - competeProjectConfig.setProjectDuration(projectConfig.getDuration()); - competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); - competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); - competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); - projectConfigDao.insertSelective(competeProjectConfig); - log.info("添加比赛日程配置：{}",competeProjectConfig); - } - //生成出场顺序表，存入数据库。在tall内添加对应的任务 - setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); - }); + param.getUpdateCompeteTaskList().forEach(projectConfig -> { + //判断时间和时长是否正确 + if (ObjectUtil.isNull(projectConfig.getStartTime()) || projectConfig.getStartTime() == 0 + || ObjectUtil.isNull(projectConfig.getEndTime()) || projectConfig.getEndTime() == 0 || + ObjectUtil.isNull(projectConfig.getDuration()) || projectConfig.getDuration() == 0) { + return; + } + //获取项目 + CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); + if (ObjectUtil.isNotNull(project)) { + type.set(project.getType()); + } + CompeteProjectConfig competeProjectConfig; + CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample(); + projectConfigExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); + List projectConfigList = projectConfigDao.selectByExample(projectConfigExample); + log.info("查找项目配置信息：{}", projectConfigList); + if (CollectionUtil.isNotEmpty(projectConfigList)) { + //有则修改 + competeProjectConfig = projectConfigList.get(0); + competeProjectConfig.setProjectDuration(projectConfig.getDuration()); + competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); + competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); + projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); + log.info("修改比赛日程配置：{}", competeProjectConfig); + } else { + //没有则添加 + competeProjectConfig = new CompeteProjectConfig(); + competeProjectConfig.setId(snowflake.nextId()); + competeProjectConfig.setProjectId(projectConfig.getProjectId()); + competeProjectConfig.setProjectDuration(projectConfig.getDuration()); + competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); + competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); + projectConfigDao.insertSelective(competeProjectConfig); + log.info("添加比赛日程配置：{}", competeProjectConfig); + } + //生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig, param.getProjectId(), param.getTallRoleId(), token); + }); return projectConfigDao.queryProjectConfig(type.get()); } + /** * 修改配置时生成出场顺序 */ - public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { + public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId, Long tallRoleId, String token) { if (ObjectUtil.isNotNull(projectConfig)) { //查找项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); if (ObjectUtil.isNotNull(project)) { //查询项目下的参赛人数或队伍 - List playerIdOrTeamIdList = competeProjectDao.queryJoinNum(project.getTeam(),project.getId()); - log.info("本项目参加的人数：{}",playerIdOrTeamIdList); + List playerIdOrTeamIdList = competeProjectDao.queryJoinNum(project.getTeam(), project.getId()); + log.info("本项目参加的人数：{}", playerIdOrTeamIdList); if (CollectionUtil.isNotEmpty(playerIdOrTeamIdList)) { //计算场次 int order = (int) Math.ceil(playerIdOrTeamIdList.size() / projectConfig.getSiteNum()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime(); long orderTime = 0; - if(order != 0) { + if (order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); - }else { - log.info("场次为0的比赛：{}------{}",project,projectConfig); + } else { + log.info("场次为0的比赛：{}------{}", project, projectConfig); } //场次 int competeOrder = 1; @@ -152,12 +153,12 @@ public class CompeteTaskService implements ICompeteTaskService{ CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); startOrderExample.createCriteria().andPlayerIdEqualTo(playerIdOrTeamId).andProjectIdEqualTo(project.getId()); List startOrderList = startOrderMapper.selectByExample(startOrderExample); - log.info("当前选手或团队参加的场次信息：{}",startOrderList); - if(CollectionUtil.isNotEmpty(startOrderList)){ + log.info("当前选手或团队参加的场次信息：{}", startOrderList); + if (CollectionUtil.isNotEmpty(startOrderList)) { CompeteStartOrder competeStartOrder = startOrderList.get(0); competeStartOrder.setSite((byte) site); competeStartOrder.setCompeteOrder((byte) competeOrder); - if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ + if (orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)) { competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); // 修改tall的任务 @@ -166,30 +167,30 @@ public class CompeteTaskService implements ICompeteTaskService{ updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); updateTaskInfo.setToken(token); - log.info("修改tall的任务信息：{}",updateTaskInfo); + log.info("修改tall的任务信息：{}", updateTaskInfo); JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); - log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); + log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); //失败return - if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { return; } } - log.info("修改场次信息：{}",competeStartOrder); + log.info("修改场次信息：{}", competeStartOrder); startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); - }else{ + } else { //添加tall的任务 Long taskId = null; TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + competeOrder +"-" + site); + addTask.setTaskName(project.getName() + competeOrder + "-" + site); addTask.setBeginTime(projectStartTime); addTask.setEndTime(projectStartTime + orderTime); addTask.setExecutorId(tallRoleId); addTask.setToken(token); - log.info("在tall内添加任务：{}",addTask); + log.info("在tall内添加任务：{}", addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); //异常return - log.info("添加任务后返回：{}",normalTaskJsonResponse); + log.info("添加任务后返回：{}", normalTaskJsonResponse); if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { return; } @@ -203,16 +204,16 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setProjectId(project.getId()); competeStartOrder.setPlayerId(playerIdOrTeamId); competeStartOrder.setSite((byte) site); - competeStartOrder.setTeam((byte) 0); + competeStartOrder.setTeam(project.getTeam()); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); - log.info("添加场次信息：{}",competeStartOrder); + log.info("添加场次信息：{}", competeStartOrder); startOrderMapper.insertSelective(competeStartOrder); } site++; - if(site > projectConfig.getSiteNum()){ + if (site > projectConfig.getSiteNum()) { site = 1; competeOrder++; projectStartTime += orderTime; @@ -320,7 +321,7 @@ public class CompeteTaskService implements ICompeteTaskService{ // //计算场次 // int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum()); // //计算每个场次时间 -// long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; +// long projectStartTime = projectConfig.getStartTime(); // long orderTime = 0; // if(order != 0) { // orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); @@ -410,7 +411,7 @@ public class CompeteTaskService implements ICompeteTaskService{ */ @Override public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { - return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(),param.getProjectId(),param.getCompeteTimeId()); + return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(), param.getProjectId(), param.getCompeteTimeId()); } /** @@ -418,38 +419,38 @@ public class CompeteTaskService implements ICompeteTaskService{ */ @Override public List queryJudgment(ProvinceCompeteDto.QueryJudgment param) { - List queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(),param.getProjectId()); - if(CollectionUtil.isNotEmpty(queryJudgmentList)){ + List queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(), param.getProjectId()); + if (CollectionUtil.isNotEmpty(queryJudgmentList)) { queryJudgmentList.forEach(projectJudgment -> { //裁判数量 int count = projectJudgment.getProjectType() == 0 ? 3 : 7; - for (int i = 0; i < projectJudgment.getSiteNums(); i++) { - if(i < projectJudgment.getSiteList().size()){ - ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); - if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { - siteJudgment.setJudgmentList(new ArrayList<>()); - } - int a = siteJudgment.getJudgmentList().size(); - for (int j = 0; j < count - a; j++) { + for (int i = 0; i < projectJudgment.getSiteNums(); i++) { + if (i < projectJudgment.getSiteList().size()) { + ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); + if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { + siteJudgment.setJudgmentList(new ArrayList<>()); + } + int a = siteJudgment.getJudgmentList().size(); + for (int j = 0; j < count - a; j++) { + ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); + siteJudgment1.setJudgmentNum(a + j); + siteJudgment.getJudgmentList().add(siteJudgment1); + } + } else { + int a = projectJudgment.getSiteList().size(); + for (int j = 0; j < count - a; j++) { + ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite(); + siteJudgment.setSiteNum(a + j + 1); + projectJudgment.getSiteList().add(siteJudgment); + int b = siteJudgment.getJudgmentList().size(); + for (int x = 0; x < count - b; x++) { ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); - siteJudgment1.setJudgmentNum(a + j); + siteJudgment1.setJudgmentNum(b + x); siteJudgment.getJudgmentList().add(siteJudgment1); } - }else { - int a = projectJudgment.getSiteList().size(); - for (int j = 0; j < count - a; j++) { - ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite(); - siteJudgment.setSiteNum(a + j + 1); - projectJudgment.getSiteList().add(siteJudgment); - int b = siteJudgment.getJudgmentList().size(); - for (int x = 0; x < count - b; x++) { - ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); - siteJudgment1.setJudgmentNum(b + x); - siteJudgment.getJudgmentList().add(siteJudgment1); - } - } } } + } }); } return queryJudgmentList; @@ -459,17 +460,17 @@ public class CompeteTaskService implements ICompeteTaskService{ * 分配裁判 */ @Override - public List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token) { + public List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param, String token) { //查找项目 - if(CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())){ - for(ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) { + if (CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())) { + for (ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) { CompeteProject project = competeProjectDao.selectByPrimaryKey(allocationJudgment.getProjectId()); if (ObjectUtil.isNotNull(project)) { if (CollectionUtil.isNotEmpty(allocationJudgment.getSiteJudgmentList())) { allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> { if (ObjectUtil.isNotNull(siteJudgment)) { siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> { - saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo,token); + saveJudgmentAndTask(param.getCompeteTimeId(), param.getTallProjectId(), project, siteJudgment, judgmentInfo, token); }); } }); @@ -477,14 +478,14 @@ public class CompeteTaskService implements ICompeteTaskService{ } } } - return competeJudgmentDao.queryJudgment(param.getCompeteTimeId(),null); + return competeJudgmentDao.queryJudgment(param.getCompeteTimeId(), null); } /** * 添加裁判信息和tall内的角色成员任务 */ - private void saveJudgmentAndTask(Long competeTimeId,Long tallProjectId,CompeteProject project - , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo,String token) { + private void saveJudgmentAndTask(Long competeTimeId, Long tallProjectId, CompeteProject project + , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo, String token) { // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 //添加裁判信息 //查找该项目下的该场地的裁判信息 @@ -493,7 +494,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgmentExample.createCriteria().andProjectIdEqualTo(project.getId()).andCompeteTimeIdEqualTo(competeTimeId) .andSiteEqualTo(siteJudgment.getSite()).andChiefJudgmentEqualTo((byte) judgmentInfo.getJudgmentNum()); List competeJudgmentList = competeJudgmentDao.selectByExample(competeJudgmentExample); - if(CollectionUtil.isNotEmpty(competeJudgmentList)){ + if (CollectionUtil.isNotEmpty(competeJudgmentList)) { competeJudgment = competeJudgmentList.get(0); competeJudgment.setName(judgmentInfo.getJudgmentName()); competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); @@ -506,7 +507,7 @@ public class CompeteTaskService implements ICompeteTaskService{ //修改角色 //修改成员 //修改任务 - }else { + } else { competeJudgment = new CompeteJudgment(); competeJudgment.setId(snowflake.nextId()); competeJudgment.setName(judgmentInfo.getJudgmentName()); @@ -553,7 +554,7 @@ public class CompeteTaskService implements ICompeteTaskService{ Long memberId = null; if (ObjectUtil.isNotNull(memberJsonResponse)) { //code等于21代表成员已存在 - if(memberJsonResponse.getCode() == 21){ + if (memberJsonResponse.getCode() == 21) { //查询该手机号在项目内的成员的id MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); getMemberByPhone.setProjectId(tallProjectId); @@ -567,7 +568,7 @@ public class CompeteTaskService implements ICompeteTaskService{ } } //将该成员添加至角色下 - if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ + if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) { MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); saveMemberInRole.setRoleId(roleId); saveMemberInRole.setMemberId(memberId); @@ -624,8 +625,8 @@ public class CompeteTaskService implements ICompeteTaskService{ public ProvinceCompeteVo.QueryProjectByTall queryProjectByTall(ProvinceCompeteDto.ProjectByTall param) { //查询比赛项目信息 ProvinceCompeteVo.QueryProjectByTall queryProjectByTall = projectConfigDao.queryProjectByTaskDetailId(param.getTaskDetailId()); - log.info("根据taskDetailId查询到的场次和项目信息：{}",queryProjectByTall); - if(ObjectUtil.isNull(queryProjectByTall)){ + log.info("根据taskDetailId查询到的场次和项目信息：{}", queryProjectByTall); + if (ObjectUtil.isNull(queryProjectByTall)) { queryProjectByTall = new ProvinceCompeteVo.QueryProjectByTall(); } //查询裁判信息 @@ -633,9 +634,9 @@ public class CompeteTaskService implements ICompeteTaskService{ CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); judgmentExample.createCriteria().andRoleIdEqualTo(param.getRoleId()); List judgmentList = competeJudgmentDao.selectByExample(judgmentExample); - if(CollectionUtil.isNotEmpty(judgmentList)){ + if (CollectionUtil.isNotEmpty(judgmentList)) { judgment = judgmentList.get(0); - log.info("根据roleId查询到的裁判信息：{}",judgment); + log.info("根据roleId查询到的裁判信息：{}", judgment); queryProjectByTall.setJudgmentId(judgment.getId()); queryProjectByTall.setJudgmentNum(judgment.getChiefJudgment()); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml index 18958c46..a742f0fe 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml @@ -71,7 +71,7 @@ LEFT JOIN t_compete_group g on p.compete_group_id = g.id LEFT JOIN t_compete_company c on p.company_id = c.id WHERE - pp.project_id = 2011 + pp.project_id = #{projectId} and pp.rec_status = 0 and p.rec_status = 0 and g.rec_status = 0 @@ -86,7 +86,7 @@ LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex LEFT JOIN t_compete_company c on t.company_id = c.id WHERE - t.project_id = 2022 + t.project_id = #{projectId} and t.rec_status = 0 and g.rec_status = 0 and c.rec_status = 0