|
|
|
@ -166,18 +166,19 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); |
|
|
|
updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); |
|
|
|
updateTaskInfo.setToken(token); |
|
|
|
log.info("修改tall的任务信息：{}", updateTaskInfo); |
|
|
|
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); |
|
|
|
log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); |
|
|
|
//失败return
|
|
|
|
if (ObjectUtil.isNull(normalTaskJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(normalTaskJsonResponse.getCode() != 200){ |
|
|
|
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
// TODO
|
|
|
|
// log.info("修改tall的任务信息：{}", updateTaskInfo);
|
|
|
|
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
|
|
|
|
// log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse);
|
|
|
|
// //失败return
|
|
|
|
// if (ObjectUtil.isNull(normalTaskJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(normalTaskJsonResponse.getCode() != 200){
|
|
|
|
// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
} |
|
|
|
log.info("修改场次信息：{}", competeStartOrder); |
|
|
|
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); |
|
|
|
@ -191,22 +192,23 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
addTask.setEndTime(projectStartTime + orderTime); |
|
|
|
addTask.setExecutorId(tallRoleId); |
|
|
|
addTask.setToken(token); |
|
|
|
log.info("在tall内添加任务：{}", addTask); |
|
|
|
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); |
|
|
|
//异常return
|
|
|
|
log.info("添加任务后返回：{}", normalTaskJsonResponse); |
|
|
|
if (ObjectUtil.isNull(normalTaskJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(normalTaskJsonResponse.getCode() != 200){ |
|
|
|
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(normalTask)) { |
|
|
|
taskId = normalTask.getDetailId(); |
|
|
|
} |
|
|
|
// TODO
|
|
|
|
// log.info("在tall内添加任务：{}", addTask);
|
|
|
|
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
|
|
|
|
// //异常return
|
|
|
|
// log.info("添加任务后返回：{}", normalTaskJsonResponse);
|
|
|
|
// if (ObjectUtil.isNull(normalTaskJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(normalTaskJsonResponse.getCode() != 200){
|
|
|
|
// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
|
|
|
|
// if (ObjectUtil.isNotNull(normalTask)) {
|
|
|
|
// taskId = normalTask.getDetailId();
|
|
|
|
// }
|
|
|
|
//添加出场顺序信息
|
|
|
|
CompeteStartOrder competeStartOrder = new CompeteStartOrder(); |
|
|
|
competeStartOrder.setId(snowflake.nextId()); |
|
|
|
@ -230,187 +232,6 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// //判断是团队还是个人项目
|
|
|
|
// if (project.getTeam() == 0) {
|
|
|
|
// //个人项目查找所有参赛信息
|
|
|
|
// CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
|
|
|
|
// projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId());
|
|
|
|
// List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
|
|
|
|
//
|
|
|
|
// if (CollectionUtil.isNotEmpty(projectPlayerList)) {
|
|
|
|
// //计算场次
|
|
|
|
// int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum());
|
|
|
|
// //计算每个场次时间
|
|
|
|
// long projectStartTime = projectConfig.getStartTime();
|
|
|
|
// long orderTime = 0;
|
|
|
|
// if(order != 0) {
|
|
|
|
// orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
|
|
|
|
// }else {
|
|
|
|
// log.info("场次为0的比赛：{}------{}",project,projectConfig);
|
|
|
|
// }
|
|
|
|
// //场次
|
|
|
|
// int competeOrder = 1;
|
|
|
|
// //场地
|
|
|
|
// int site = 1;
|
|
|
|
// for (CompeteProjectPlayer projectPlayer : projectPlayerList) {
|
|
|
|
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
|
|
|
|
// startOrderExample.createCriteria().andPlayerIdEqualTo(projectPlayer.getId()).andProjectIdEqualTo(project.getId());
|
|
|
|
// List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
|
|
|
|
// 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)){
|
|
|
|
// 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<TaskVo.NormalTask> 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<TaskVo.NormalTask> 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());
|
|
|
|
// competeStartOrder.setProjectId(project.getId());
|
|
|
|
// competeStartOrder.setPlayerId(projectPlayer.getId());
|
|
|
|
// competeStartOrder.setSite((byte) site);
|
|
|
|
// competeStartOrder.setTeam((byte) 0);
|
|
|
|
// competeStartOrder.setCompeteOrder((byte) competeOrder);
|
|
|
|
// competeStartOrder.setTaskId(taskId);
|
|
|
|
// competeStartOrder.setStartTime(projectStartTime);
|
|
|
|
// competeStartOrder.setEndTime(projectStartTime + orderTime);
|
|
|
|
// startOrderMapper.insertSelective(competeStartOrder);
|
|
|
|
// }
|
|
|
|
// site++;
|
|
|
|
// if(site > projectConfig.getSiteNum()){
|
|
|
|
// site = 1;
|
|
|
|
// competeOrder++;
|
|
|
|
// projectStartTime += orderTime;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// } else {
|
|
|
|
// //团体项目查找所有参赛队伍
|
|
|
|
// CompeteTeamExample teamExample = new CompeteTeamExample();
|
|
|
|
// teamExample.createCriteria().andProjectIdEqualTo(project.getId());
|
|
|
|
// List<CompeteTeam> teamList = competeTeamDao.selectByExample(teamExample);
|
|
|
|
// if(CollectionUtil.isNotEmpty(teamList)){
|
|
|
|
// //计算场次
|
|
|
|
// int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum());
|
|
|
|
// //计算每个场次时间
|
|
|
|
// long projectStartTime = projectConfig.getStartTime();
|
|
|
|
// long orderTime = 0;
|
|
|
|
// if(order != 0) {
|
|
|
|
// orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
|
|
|
|
// }
|
|
|
|
// //场次
|
|
|
|
// int competeOrder = 1;
|
|
|
|
// //场地
|
|
|
|
// int site = 1;
|
|
|
|
// for (CompeteTeam competeTeam : teamList) {
|
|
|
|
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
|
|
|
|
// startOrderExample.createCriteria().andPlayerIdEqualTo(competeTeam.getId()).andProjectIdEqualTo(project.getId());
|
|
|
|
// List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
|
|
|
|
// 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)){
|
|
|
|
// 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<TaskVo.NormalTask> 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<TaskVo.NormalTask> 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());
|
|
|
|
// competeStartOrder.setProjectId(project.getId());
|
|
|
|
// competeStartOrder.setPlayerId(competeTeam.getId());
|
|
|
|
// competeStartOrder.setSite((byte) site);
|
|
|
|
// competeStartOrder.setTeam((byte) 0);
|
|
|
|
// competeStartOrder.setCompeteOrder((byte) competeOrder);
|
|
|
|
// competeStartOrder.setTaskId(taskId);
|
|
|
|
// competeStartOrder.setStartTime(projectStartTime);
|
|
|
|
// competeStartOrder.setEndTime(projectStartTime + orderTime);
|
|
|
|
// startOrderMapper.insertSelective(competeStartOrder);
|
|
|
|
// }
|
|
|
|
// site++;
|
|
|
|
// if(site > projectConfig.getSiteNum()){
|
|
|
|
// site = 1;
|
|
|
|
// competeOrder++;
|
|
|
|
// projectStartTime += orderTime;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -463,39 +284,6 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//
|
|
|
|
// projectJudgment.getSiteList().forEach(site-> judgmentMap.put(site.getSiteNum(),site.getSiteNum()));
|
|
|
|
// 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<>());
|
|
|
|
// }else {
|
|
|
|
// siteJudgment.getJudgmentList().forEach(judgment -> siteMap.put(judgment.getJudgmentNum(),judgment.getJudgmentNum()));
|
|
|
|
// }
|
|
|
|
// for (int j = 0; j < count; j++) {
|
|
|
|
// if(siteMap.get(j) == null) {
|
|
|
|
// ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
|
|
|
|
// siteJudgment1.setJudgmentNum(j);
|
|
|
|
// siteJudgment.getJudgmentList().add(siteJudgment1);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// CollectionUtil.sort(siteJudgment.getJudgmentList(), Comparator.comparingInt(ProvinceCompeteVo.SiteJudgment::getJudgmentNum));
|
|
|
|
// } else {
|
|
|
|
// int a = projectJudgment.getSiteList().size();
|
|
|
|
// for (int j = 0; j < projectJudgment.getSiteNums(); 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; |
|
|
|
@ -555,159 +343,160 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
//修改成员
|
|
|
|
//修改任务
|
|
|
|
} else { |
|
|
|
//添加角色
|
|
|
|
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<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole); |
|
|
|
log.info("添加角色后返回：{}", roleJsonResponse); |
|
|
|
//失败return
|
|
|
|
if (ObjectUtil.isNull(roleJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if( roleJsonResponse.getCode() != 200) { |
|
|
|
log.info("调用tall异常后返回：{}", roleJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
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<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember); |
|
|
|
log.info("添加成员后返回：{}", memberJsonResponse); |
|
|
|
//如果成员已存在，查询成员信息然后添加至角色内
|
|
|
|
Long memberId = null; |
|
|
|
Long userId = null; |
|
|
|
//失败return
|
|
|
|
if (ObjectUtil.isNull(memberJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){ |
|
|
|
log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(roleJsonResponse.getCode() == 200){ |
|
|
|
MemberVo.Member member = memberJsonResponse.getData(); |
|
|
|
if(ObjectUtil.isNotNull(member)){ |
|
|
|
userId = member.getUserId(); |
|
|
|
} |
|
|
|
} |
|
|
|
//code等于21代表成员已存在
|
|
|
|
if (memberJsonResponse.getCode() == 21) { |
|
|
|
log.info("该成员已存在：{}", memberJsonResponse.getMsg()); |
|
|
|
//查询该手机号在项目内的成员的id
|
|
|
|
MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); |
|
|
|
getMemberByPhone.setProjectId(tallProjectId); |
|
|
|
getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
|
getMemberByPhone.setToken(token); |
|
|
|
log.info("查找该手机号以前的成员信息：{}", judgmentInfo.getJudgmentPhone()); |
|
|
|
JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); |
|
|
|
log.info("查找该手机号以前的成员信息返回：{}", memberListJsonResponse); |
|
|
|
//失败return
|
|
|
|
if (ObjectUtil.isNull(memberListJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(memberListJsonResponse.getCode() != 200){ |
|
|
|
log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
MemberVo.MemberList memberList = memberListJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(memberList)) { |
|
|
|
memberId = memberList.getMemberId(); |
|
|
|
userId = memberList.getUserId(); |
|
|
|
} |
|
|
|
|
|
|
|
//将该成员添加至角色下
|
|
|
|
if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) { |
|
|
|
MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); |
|
|
|
saveMemberInRole.setRoleId(roleId); |
|
|
|
saveMemberInRole.setMemberId(memberId); |
|
|
|
saveMemberInRole.setToken(token); |
|
|
|
log.info("将该成员添加至角色内"); |
|
|
|
JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); |
|
|
|
if (ObjectUtil.isNull(jsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(jsonResponse.getCode() != 200){ |
|
|
|
log.info("调用tall异常后返回：{}", jsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//添加任务
|
|
|
|
//查找场次信息表
|
|
|
|
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); |
|
|
|
startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) |
|
|
|
.andSiteEqualTo((byte) siteJudgment.getSite()); |
|
|
|
List<CompeteStartOrder> 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<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); |
|
|
|
log.info("添加任务后返回：{}", normalTaskJsonResponse); |
|
|
|
if (ObjectUtil.isNull(normalTaskJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(normalTaskJsonResponse.getCode() != 200){ |
|
|
|
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
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<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); |
|
|
|
log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); |
|
|
|
if (ObjectUtil.isNull(pluginVoJsonResponse)) { |
|
|
|
log.info("调用tall返回null"); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(pluginVoJsonResponse.getCode() != 200){ |
|
|
|
log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg()); |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// TODO
|
|
|
|
// //添加角色
|
|
|
|
// 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<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
|
|
|
|
// log.info("添加角色后返回：{}", roleJsonResponse);
|
|
|
|
// //失败return
|
|
|
|
// if (ObjectUtil.isNull(roleJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if( roleJsonResponse.getCode() != 200) {
|
|
|
|
// log.info("调用tall异常后返回：{}", roleJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// 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<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
|
|
|
|
// log.info("添加成员后返回：{}", memberJsonResponse);
|
|
|
|
// //如果成员已存在，查询成员信息然后添加至角色内
|
|
|
|
// Long memberId = null;
|
|
|
|
// Long userId = null;
|
|
|
|
// //失败return
|
|
|
|
// if (ObjectUtil.isNull(memberJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){
|
|
|
|
// log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(roleJsonResponse.getCode() == 200){
|
|
|
|
// MemberVo.Member member = memberJsonResponse.getData();
|
|
|
|
// if(ObjectUtil.isNotNull(member)){
|
|
|
|
// userId = member.getUserId();
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// //code等于21代表成员已存在
|
|
|
|
// if (memberJsonResponse.getCode() == 21) {
|
|
|
|
// log.info("该成员已存在：{}", memberJsonResponse.getMsg());
|
|
|
|
// //查询该手机号在项目内的成员的id
|
|
|
|
// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone();
|
|
|
|
// getMemberByPhone.setProjectId(tallProjectId);
|
|
|
|
// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone());
|
|
|
|
// getMemberByPhone.setToken(token);
|
|
|
|
// log.info("查找该手机号以前的成员信息：{}", judgmentInfo.getJudgmentPhone());
|
|
|
|
// JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone);
|
|
|
|
// log.info("查找该手机号以前的成员信息返回：{}", memberListJsonResponse);
|
|
|
|
// //失败return
|
|
|
|
// if (ObjectUtil.isNull(memberListJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(memberListJsonResponse.getCode() != 200){
|
|
|
|
// log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// MemberVo.MemberList memberList = memberListJsonResponse.getData();
|
|
|
|
// if (ObjectUtil.isNotNull(memberList)) {
|
|
|
|
// memberId = memberList.getMemberId();
|
|
|
|
// userId = memberList.getUserId();
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// //将该成员添加至角色下
|
|
|
|
// if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) {
|
|
|
|
// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
|
|
|
|
// saveMemberInRole.setRoleId(roleId);
|
|
|
|
// saveMemberInRole.setMemberId(memberId);
|
|
|
|
// saveMemberInRole.setToken(token);
|
|
|
|
// log.info("将该成员添加至角色内");
|
|
|
|
// JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole);
|
|
|
|
// if (ObjectUtil.isNull(jsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(jsonResponse.getCode() != 200){
|
|
|
|
// log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// //添加任务
|
|
|
|
// //查找场次信息表
|
|
|
|
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
|
|
|
|
// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId())
|
|
|
|
// .andSiteEqualTo((byte) siteJudgment.getSite());
|
|
|
|
// List<CompeteStartOrder> 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<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
|
|
|
|
// log.info("添加任务后返回：{}", normalTaskJsonResponse);
|
|
|
|
// if (ObjectUtil.isNull(normalTaskJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(normalTaskJsonResponse.getCode() != 200){
|
|
|
|
// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// 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<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
|
|
|
|
// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
|
|
|
|
// if (ObjectUtil.isNull(pluginVoJsonResponse)) {
|
|
|
|
// log.info("调用tall返回null");
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// if(pluginVoJsonResponse.getCode() != 200){
|
|
|
|
// log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg());
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//添加裁判
|
|
|
|
competeJudgment = new CompeteJudgment(); |
|
|
|
competeJudgment.setId(snowflake.nextId()); |
|
|
|
@ -718,9 +507,9 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
competeJudgment.setProjectId(project.getId()); |
|
|
|
competeJudgment.setSite(siteJudgment.getSite()); |
|
|
|
competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); |
|
|
|
competeJudgment.setRoleId(roleId); |
|
|
|
competeJudgment.setMemberId(memberId); |
|
|
|
competeJudgment.setUserId(userId); |
|
|
|
// competeJudgment.setRoleId(roleId);
|
|
|
|
// competeJudgment.setMemberId(memberId);
|
|
|
|
// competeJudgment.setUserId(userId);
|
|
|
|
competeJudgmentDao.insertSelective(competeJudgment); |
|
|
|
|
|
|
|
} |
|
|
|
|
Lihong@123456
5 years ago