|
|
@ -3,6 +3,7 @@ package com.ccsens.mt.service; |
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import cn.hutool.core.lang.Snowflake; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; |
|
|
|
import com.ccsens.cloudutil.bean.tall.dto.TallTaskDto; |
|
|
|
import com.ccsens.cloudutil.bean.tall.vo.MemberVo; |
|
|
@ -475,7 +476,9 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> { |
|
|
|
if (ObjectUtil.isNotNull(siteJudgment)) { |
|
|
|
siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> { |
|
|
|
saveJudgmentAndTask(param.getCompeteTimeId(), param.getTallProjectId(), project, siteJudgment, judgmentInfo, token); |
|
|
|
if(StrUtil.isNotEmpty(judgmentInfo.getJudgmentPhone())) { |
|
|
|
saveJudgmentAndTask(param.getCompeteTimeId(), param.getTallProjectId(), project, siteJudgment, judgmentInfo, token); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
}); |
|
|
@ -513,17 +516,6 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
//修改成员
|
|
|
|
//修改任务
|
|
|
|
} else { |
|
|
|
competeJudgment = new CompeteJudgment(); |
|
|
|
competeJudgment.setId(snowflake.nextId()); |
|
|
|
competeJudgment.setName(judgmentInfo.getJudgmentName()); |
|
|
|
competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
|
competeJudgment.setRemark(judgmentInfo.getRemark()); |
|
|
|
competeJudgment.setCompeteTimeId(competeTimeId); |
|
|
|
competeJudgment.setProjectId(project.getId()); |
|
|
|
competeJudgment.setSite(siteJudgment.getSite()); |
|
|
|
competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); |
|
|
|
competeJudgmentDao.insertSelective(competeJudgment); |
|
|
|
|
|
|
|
//添加角色
|
|
|
|
MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); |
|
|
|
saveRole.setProjectId(tallProjectId); |
|
|
@ -539,11 +531,13 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
log.info("在tall内添加角色:{}", saveRole); |
|
|
|
JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole); |
|
|
|
log.info("添加角色后返回:{}", roleJsonResponse); |
|
|
|
if (ObjectUtil.isNotNull(roleJsonResponse)) { |
|
|
|
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(roleInfo)) { |
|
|
|
roleId = roleInfo.getRoleId(); |
|
|
|
} |
|
|
|
//失败return
|
|
|
|
if (ObjectUtil.isNull(roleJsonResponse) || roleJsonResponse.getCode() != 200) { |
|
|
|
return; |
|
|
|
} |
|
|
|
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(roleInfo)) { |
|
|
|
roleId = roleInfo.getRoleId(); |
|
|
|
} |
|
|
|
//添加成员
|
|
|
|
MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); |
|
|
@ -557,31 +551,45 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
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<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); |
|
|
|
if (ObjectUtil.isNotNull(memberListJsonResponse)) { |
|
|
|
MemberVo.MemberList memberList = memberListJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(memberList)) { |
|
|
|
memberId = memberList.getMemberId(); |
|
|
|
} |
|
|
|
Long userId = null; |
|
|
|
//失败return
|
|
|
|
if (ObjectUtil.isNull(memberJsonResponse)) { |
|
|
|
return; |
|
|
|
} |
|
|
|
if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){ |
|
|
|
return; |
|
|
|
} |
|
|
|
if(roleJsonResponse.getCode() == 200){ |
|
|
|
MemberVo.Member member = memberJsonResponse.getData(); |
|
|
|
userId = member.getUserId(); |
|
|
|
} |
|
|
|
//code等于21代表成员已存在
|
|
|
|
if (memberJsonResponse.getCode() == 21) { |
|
|
|
//查询该手机号在项目内的成员的id
|
|
|
|
MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); |
|
|
|
getMemberByPhone.setProjectId(tallProjectId); |
|
|
|
getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
|
getMemberByPhone.setToken(token); |
|
|
|
JsonResponse<MemberVo.MemberList> 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); |
|
|
|
} |
|
|
|
//将该成员添加至角色下
|
|
|
|
if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) { |
|
|
|
MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); |
|
|
|
saveMemberInRole.setRoleId(roleId); |
|
|
|
saveMemberInRole.setMemberId(memberId); |
|
|
|
saveMemberInRole.setToken(token); |
|
|
|
JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); |
|
|
|
if (ObjectUtil.isNull(jsonResponse) || jsonResponse.getCode() != 200) { |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//添加任务
|
|
|
|
//查找场次信息表
|
|
|
|
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); |
|
|
@ -602,6 +610,9 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
log.info("在tall内添加任务:{}", addTask); |
|
|
|
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); |
|
|
|
log.info("添加任务后返回:{}", normalTaskJsonResponse); |
|
|
|
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { |
|
|
|
return; |
|
|
|
} |
|
|
|
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { |
|
|
|
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(normalTask)) { |
|
|
@ -613,13 +624,28 @@ public class CompeteTaskService implements ICompeteTaskService { |
|
|
|
log.info("修改tall内任务插件配置:{}", updatePluginConfig); |
|
|
|
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); |
|
|
|
log.info("修改任务插件配置后返回:{}", pluginVoJsonResponse); |
|
|
|
if (ObjectUtil.isNull(pluginVoJsonResponse) || pluginVoJsonResponse.getCode() != 200) { |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//添加裁判
|
|
|
|
competeJudgment = new CompeteJudgment(); |
|
|
|
competeJudgment.setId(snowflake.nextId()); |
|
|
|
competeJudgment.setName(judgmentInfo.getJudgmentName()); |
|
|
|
competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
|
competeJudgment.setRemark(judgmentInfo.getRemark()); |
|
|
|
competeJudgment.setCompeteTimeId(competeTimeId); |
|
|
|
competeJudgment.setProjectId(project.getId()); |
|
|
|
competeJudgment.setSite(siteJudgment.getSite()); |
|
|
|
competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); |
|
|
|
competeJudgment.setRoleId(roleId); |
|
|
|
competeJudgment.setMemberId(memberId); |
|
|
|
competeJudgmentDao.updateByPrimaryKeySelective(competeJudgment); |
|
|
|
competeJudgment.setUserId(userId); |
|
|
|
competeJudgmentDao.insertSelective(competeJudgment); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|