|
|
@ -109,7 +109,7 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
projectConfigDao.insertSelective(competeProjectConfig); |
|
|
projectConfigDao.insertSelective(competeProjectConfig); |
|
|
} |
|
|
} |
|
|
// 生成出场顺序表，存入数据库。在tall内添加对应的任务
|
|
|
// 生成出场顺序表，存入数据库。在tall内添加对应的任务
|
|
|
setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); |
|
|
// setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token);
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
return projectConfigDao.queryProjectConfig(type.get()); |
|
|
return projectConfigDao.queryProjectConfig(type.get()); |
|
|
@ -418,99 +418,99 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
competeJudgment.setSite(siteJudgment.getSite()); |
|
|
competeJudgment.setSite(siteJudgment.getSite()); |
|
|
competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); |
|
|
competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); |
|
|
competeJudgmentDao.insertSelective(competeJudgment); |
|
|
competeJudgmentDao.insertSelective(competeJudgment); |
|
|
//添加角色
|
|
|
// //添加角色
|
|
|
MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); |
|
|
// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
|
|
|
saveRole.setProjectId(tallProjectId); |
|
|
// saveRole.setProjectId(tallProjectId);
|
|
|
String jdgmentNum = ""; |
|
|
// String jdgmentNum = "";
|
|
|
if (judgmentInfo.getJudgmentNum() == 0) { |
|
|
// if (judgmentInfo.getJudgmentNum() == 0) {
|
|
|
jdgmentNum = "主裁判"; |
|
|
// jdgmentNum = "主裁判";
|
|
|
} else { |
|
|
// } else {
|
|
|
jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); |
|
|
// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum();
|
|
|
} |
|
|
// }
|
|
|
saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); |
|
|
// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum);
|
|
|
Long roleId = null; |
|
|
// Long roleId = null;
|
|
|
saveRole.setToken(token); |
|
|
// saveRole.setToken(token);
|
|
|
log.info("在tall内添加角色：{}", saveRole); |
|
|
// log.info("在tall内添加角色：{}", saveRole);
|
|
|
JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole); |
|
|
// JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
|
|
|
log.info("添加角色后返回：{}", roleJsonResponse); |
|
|
// log.info("添加角色后返回：{}", roleJsonResponse);
|
|
|
if (ObjectUtil.isNotNull(roleJsonResponse)) { |
|
|
// if (ObjectUtil.isNotNull(roleJsonResponse)) {
|
|
|
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); |
|
|
// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
|
|
|
if (ObjectUtil.isNotNull(roleInfo)) { |
|
|
// if (ObjectUtil.isNotNull(roleInfo)) {
|
|
|
roleId = roleInfo.getRoleId(); |
|
|
// roleId = roleInfo.getRoleId();
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
//添加成员
|
|
|
// //添加成员
|
|
|
MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); |
|
|
// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember();
|
|
|
saveMember.setMemberName(judgmentInfo.getJudgmentName()); |
|
|
// saveMember.setMemberName(judgmentInfo.getJudgmentName());
|
|
|
saveMember.setProjectId(tallProjectId); |
|
|
// saveMember.setProjectId(tallProjectId);
|
|
|
saveMember.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
// saveMember.setPhone(judgmentInfo.getJudgmentPhone());
|
|
|
saveMember.setRoleId(Arrays.asList(roleId)); |
|
|
// saveMember.setRoleId(Arrays.asList(roleId));
|
|
|
saveMember.setToken(token); |
|
|
// saveMember.setToken(token);
|
|
|
log.info("在tall内添加成员：{}", saveMember); |
|
|
// log.info("在tall内添加成员：{}", saveMember);
|
|
|
JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember); |
|
|
// JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
|
|
|
log.info("添加成员后返回：{}", memberJsonResponse); |
|
|
// log.info("添加成员后返回：{}", memberJsonResponse);
|
|
|
//如果成员已存在，查询成员信息然后添加至角色内
|
|
|
// //如果成员已存在，查询成员信息然后添加至角色内
|
|
|
Long memberId = null; |
|
|
// Long memberId = null;
|
|
|
if (ObjectUtil.isNotNull(memberJsonResponse)) { |
|
|
// if (ObjectUtil.isNotNull(memberJsonResponse)) {
|
|
|
//code等于21代表成员已存在
|
|
|
// //code等于21代表成员已存在
|
|
|
if(memberJsonResponse.getCode() == 21){ |
|
|
// if(memberJsonResponse.getCode() == 21){
|
|
|
//查询该手机号在项目内的成员的id
|
|
|
// //查询该手机号在项目内的成员的id
|
|
|
MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); |
|
|
// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone();
|
|
|
getMemberByPhone.setProjectId(tallProjectId); |
|
|
// getMemberByPhone.setProjectId(tallProjectId);
|
|
|
getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone());
|
|
|
getMemberByPhone.setToken(token); |
|
|
// getMemberByPhone.setToken(token);
|
|
|
JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); |
|
|
// JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone);
|
|
|
if (ObjectUtil.isNotNull(memberListJsonResponse)) { |
|
|
// if (ObjectUtil.isNotNull(memberListJsonResponse)) {
|
|
|
MemberVo.MemberList memberList = memberListJsonResponse.getData(); |
|
|
// MemberVo.MemberList memberList = memberListJsonResponse.getData();
|
|
|
if (ObjectUtil.isNotNull(memberList)) { |
|
|
// if (ObjectUtil.isNotNull(memberList)) {
|
|
|
memberId = memberList.getMemberId(); |
|
|
// memberId = memberList.getMemberId();
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
//将该成员添加至角色下
|
|
|
// //将该成员添加至角色下
|
|
|
if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ |
|
|
// if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){
|
|
|
MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); |
|
|
// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
|
|
|
saveMemberInRole.setRoleId(roleId); |
|
|
// saveMemberInRole.setRoleId(roleId);
|
|
|
saveMemberInRole.setMemberId(memberId); |
|
|
// saveMemberInRole.setMemberId(memberId);
|
|
|
saveMemberInRole.setToken(token); |
|
|
// saveMemberInRole.setToken(token);
|
|
|
tallFeignClient.saveMemberInRole(saveMemberInRole); |
|
|
// tallFeignClient.saveMemberInRole(saveMemberInRole);
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
//添加任务
|
|
|
// //添加任务
|
|
|
//查找场次信息表
|
|
|
// //查找场次信息表
|
|
|
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); |
|
|
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
|
|
|
startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) |
|
|
// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId())
|
|
|
.andSiteEqualTo((byte) siteJudgment.getSite()); |
|
|
// .andSiteEqualTo((byte) siteJudgment.getSite());
|
|
|
List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample); |
|
|
// List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
|
|
|
if (CollectionUtil.isNotEmpty(startOrderList)) { |
|
|
// if (CollectionUtil.isNotEmpty(startOrderList)) {
|
|
|
for (CompeteStartOrder startOrder : startOrderList) { |
|
|
// for (CompeteStartOrder startOrder : startOrderList) {
|
|
|
TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); |
|
|
// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
|
|
|
addTask.setProjectId(tallProjectId); |
|
|
// addTask.setProjectId(tallProjectId);
|
|
|
addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" |
|
|
// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-"
|
|
|
+ startOrder.getSite() + "-" + jdgmentNum); |
|
|
// + startOrder.getSite() + "-" + jdgmentNum);
|
|
|
addTask.setBeginTime(startOrder.getStartTime()); |
|
|
// addTask.setBeginTime(startOrder.getStartTime());
|
|
|
addTask.setEndTime(startOrder.getEndTime()); |
|
|
// addTask.setEndTime(startOrder.getEndTime());
|
|
|
addTask.setExecutorId(roleId); |
|
|
// addTask.setExecutorId(roleId);
|
|
|
addTask.setParentTaskId(startOrder.getTaskId()); |
|
|
// addTask.setParentTaskId(startOrder.getTaskId());
|
|
|
addTask.setToken(token); |
|
|
// addTask.setToken(token);
|
|
|
log.info("在tall内添加任务：{}", addTask); |
|
|
// log.info("在tall内添加任务：{}", addTask);
|
|
|
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); |
|
|
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
|
|
|
log.info("添加任务后返回：{}", normalTaskJsonResponse); |
|
|
// log.info("添加任务后返回：{}", normalTaskJsonResponse);
|
|
|
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { |
|
|
// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
|
|
|
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); |
|
|
// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
|
|
|
if (ObjectUtil.isNotNull(normalTask)) { |
|
|
// if (ObjectUtil.isNotNull(normalTask)) {
|
|
|
//修改任务插件配置信息
|
|
|
// //修改任务插件配置信息
|
|
|
TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); |
|
|
// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig();
|
|
|
updatePluginConfig.setWebPath("/home/osct/video-score"); |
|
|
// updatePluginConfig.setWebPath("/home/osct/video-score");
|
|
|
updatePluginConfig.setTaskId(normalTask.getDetailId()); |
|
|
// updatePluginConfig.setTaskId(normalTask.getDetailId());
|
|
|
updatePluginConfig.setToken(token); |
|
|
// updatePluginConfig.setToken(token);
|
|
|
log.info("修改tall内任务插件配置：{}", updatePluginConfig); |
|
|
// log.info("修改tall内任务插件配置：{}", updatePluginConfig);
|
|
|
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); |
|
|
// JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
|
|
|
log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); |
|
|
// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
// }
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
