diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index 16314894..7ae7749b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -224,9 +224,9 @@ public class ProvinceCompeteDto { @ApiModelProperty("场地数量") private int siteNum = 1; @ApiModelProperty("项目开始时间") - private Long startTime; + private Long startTime = 0L; @ApiModelProperty("项目结束时间") - private Long endTime; + private Long endTime = 0L; } @Data 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 47861d36..7ad3e855 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -92,8 +92,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig = projectConfigList.get(0); competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); - competeProjectConfig.setStartTime(projectConfig.getStartTime()); - competeProjectConfig.setEndTime(projectConfig.getEndTime()); + competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); }else { //没有则添加 @@ -102,8 +102,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setProjectId(projectConfig.getProjectId()); competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); - competeProjectConfig.setStartTime(projectConfig.getStartTime()); - competeProjectConfig.setEndTime(projectConfig.getEndTime()); + competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } // 生成出场顺序表，存入数据库。在tall内添加对应的任务 @@ -116,6 +116,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 修改配置时生成出场顺序 */ public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { + if (ObjectUtil.isNotNull(projectConfig)) { //查找项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); @@ -128,10 +129,15 @@ public class CompeteTaskService implements ICompeteTaskService{ List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); if (CollectionUtil.isNotEmpty(projectPlayerList)) { //计算场次 - int order = (int) Math.ceil(projectConfig.getSiteNum() / projectPlayerList.size()); + int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; - long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + long orderTime = 0; + if(order != 0) { + orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + }else { + log.info("场次为0的比赛：{}------{}",project,projectConfig); + } //场次 int competeOrder = 1; //场地 @@ -153,7 +159,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 +175,9 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setEndTime(projectStartTime + orderTime); addTask.setExecutorId(tallRoleId); 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)) { @@ -202,10 +212,16 @@ public class CompeteTaskService implements ICompeteTaskService{ List teamList = competeTeamDao.selectByExample(teamExample); if(CollectionUtil.isNotEmpty(teamList)){ //计算场次 - int order = (int) Math.ceil(projectConfig.getSiteNum() / teamList.size()); + int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; - long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + long orderTime = 0; + if(order != 0) { + orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + }else { + log.info("场次为0的比赛：{}------{}",project,projectConfig); + } +// long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场次 int competeOrder = 1; //场地 @@ -227,7 +243,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 +259,9 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setEndTime(projectStartTime + orderTime); addTask.setExecutorId(1L); 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)) { @@ -345,9 +365,11 @@ public class CompeteTaskService implements ICompeteTaskService{ saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); Long roleId = null; saveRole.setToken(token); - JsonResponse memberJsonResponse = tallFeignClient.saveRole(saveRole); - if (ObjectUtil.isNotNull(memberJsonResponse)) { - MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); + 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(); } @@ -359,7 +381,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 memberJsonResponse = tallFeignClient.saveMember(saveMember); + log.info("添加成员后返回：{}",memberJsonResponse); //添加任务 //查找场次信息表 CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); @@ -377,7 +401,9 @@ public class CompeteTaskService implements ICompeteTaskService{ 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)) { @@ -386,7 +412,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 pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); + log.info("修改任务插件配置后返回：{}",pluginVoJsonResponse); } } } diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java index 16c0de60..ab981f86 100644 --- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java +++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java @@ -10,6 +10,7 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.annotation.OperateType; import io.jsonwebtoken.Claims; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; +@Slf4j @Api(tags = "任务相关API" , description = "") @RestController @RequestMapping("/tasks") @@ -224,7 +226,7 @@ public class TaskController { public JsonResponse addTask(HttpServletRequest request, @ApiParam @Validated @RequestBody TaskDto.AddTask addTask) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); - + log.info("新加任务，userId：{}、任务信息：{}",currentUserId,addTask); TaskVo.NormalTask normalTask = subTimeService.addTask(currentUserId,addTask); return JsonResponse.newInstance().ok(normalTask); }