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 be6beb10..cb741a6a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -108,8 +108,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } - // 生成出场顺序表，存入数据库。在tall内添加对应的任务 -// setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); + //生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); return projectConfigDao.queryProjectConfig(type.get()); @@ -418,99 +418,99 @@ 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); + } + } + } + } } } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 8f4b9247..aafce982 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -185,7 +185,8 @@ pc.start_time as startTime, pc.end_time as endTime FROM - t_compete_project p LEFT JOIN t_compete_project_config pc on pc.project_id = p.id + t_compete_project p + LEFT JOIN (SELECT * FROM t_compete_project_config WHERE rec_status = 0 and rec_status is null) pc on pc.project_id = p.id LEFT JOIN ( SELECT