|
|
@ -153,7 +153,9 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
updateTaskInfo.setBeginTime(competeStartOrder.getId()); |
|
|
|
updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); |
|
|
|
updateTaskInfo.setToken(token); |
|
|
|
log.info("修改tall的任务信息:{}",updateTaskInfo); |
|
|
|
tallFeignClient.updataTask(updateTaskInfo); |
|
|
|
log.info("修改tall的任务信息后返回:{}",updateTaskInfo); |
|
|
|
} |
|
|
|
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); |
|
|
|
|
|
|
@ -167,7 +169,9 @@ 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); |
|
|
|
log.info("添加任务后返回:{}",normalTaskJsonResponse); |
|
|
|
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { |
|
|
|
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(normalTask)) { |
|
|
@ -227,7 +231,9 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
updateTaskInfo.setBeginTime(competeStartOrder.getId()); |
|
|
|
updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); |
|
|
|
updateTaskInfo.setToken(token); |
|
|
|
log.info("修改tall的任务信息:{}",updateTaskInfo); |
|
|
|
tallFeignClient.updataTask(updateTaskInfo); |
|
|
|
log.info("修改tall的任务信息后返回:{}",updateTaskInfo); |
|
|
|
} |
|
|
|
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); |
|
|
|
|
|
|
@ -241,7 +247,9 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
addTask.setEndTime(projectStartTime + orderTime); |
|
|
|
addTask.setExecutorId(1L); |
|
|
|
addTask.setToken(token); |
|
|
|
log.info("在tall内添加任务:{}",addTask); |
|
|
|
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); |
|
|
|
log.info("添加任务后返回:{}",normalTaskJsonResponse); |
|
|
|
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { |
|
|
|
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(normalTask)) { |
|
|
@ -345,9 +353,11 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); |
|
|
|
Long roleId = null; |
|
|
|
saveRole.setToken(token); |
|
|
|
JsonResponse<MemberVo.RoleInfo> memberJsonResponse = tallFeignClient.saveRole(saveRole); |
|
|
|
if (ObjectUtil.isNotNull(memberJsonResponse)) { |
|
|
|
MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); |
|
|
|
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(); |
|
|
|
} |
|
|
@ -359,7 +369,9 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
saveMember.setPhone(judgmentInfo.getJudgmentPhone()); |
|
|
|
saveMember.setRoleId(Arrays.asList(roleId)); |
|
|
|
saveMember.setToken(token); |
|
|
|
tallFeignClient.saveMember(saveMember); |
|
|
|
log.info("在tall内添加成员:{}",saveMember); |
|
|
|
JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember); |
|
|
|
log.info("添加成员后返回:{}",memberJsonResponse); |
|
|
|
//添加任务
|
|
|
|
//查找场次信息表
|
|
|
|
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); |
|
|
@ -377,7 +389,9 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
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.isNotNull(normalTaskJsonResponse)) { |
|
|
|
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); |
|
|
|
if (ObjectUtil.isNotNull(normalTask)) { |
|
|
@ -386,7 +400,9 @@ public class CompeteTaskService implements ICompeteTaskService{ |
|
|
|
updatePluginConfig.setWebPath("/home/osct/video-score"); |
|
|
|
updatePluginConfig.setTaskId(normalTask.getDetailId()); |
|
|
|
updatePluginConfig.setToken(token); |
|
|
|
tallFeignClient.updatePluginConfig(updatePluginConfig); |
|
|
|
log.info("修改tall内任务插件配置:{}",updatePluginConfig); |
|
|
|
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); |
|
|
|
log.info("修改任务插件配置后返回:{}",pluginVoJsonResponse); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|