ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

tiaosheng
Lihong@123456 5 years ago
parent
cc5ed3f831 2debd348d3
commit
16311871d5
3 changed files with 46 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
  2. 54
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  3. 4
      tall/src/main/java/com/ccsens/tall/web/TaskController.java

4
mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
View File

@ -224,9 +224,9 @@ public class ProvinceCompeteDto {
@ApiModelProperty("场地数量") @ApiModelProperty("场地数量")
private int siteNum = 1; private int siteNum = 1;
@ApiModelProperty("项目开始时间") @ApiModelProperty("项目开始时间")
private Long startTime; private Long startTime = 0L;
@ApiModelProperty("项目结束时间") @ApiModelProperty("项目结束时间")
private Long endTime; private Long endTime = 0L;
} }
@Data @Data

54
mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
View File

@ -92,8 +92,8 @@ public class CompeteTaskService implements ICompeteTaskService{
competeProjectConfig = projectConfigList.get(0); competeProjectConfig = projectConfigList.get(0);
competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setProjectDuration(projectConfig.getDuration());
competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum());
competeProjectConfig.setStartTime(projectConfig.getStartTime()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
competeProjectConfig.setEndTime(projectConfig.getEndTime()); competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime());
projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig);
}else { }else {
//没有则添加 //没有则添加
@ -102,8 +102,8 @@ public class CompeteTaskService implements ICompeteTaskService{
competeProjectConfig.setProjectId(projectConfig.getProjectId()); competeProjectConfig.setProjectId(projectConfig.getProjectId());
competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setProjectDuration(projectConfig.getDuration());
competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum());
competeProjectConfig.setStartTime(projectConfig.getStartTime()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
competeProjectConfig.setEndTime(projectConfig.getEndTime()); competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime());
projectConfigDao.insertSelective(competeProjectConfig); projectConfigDao.insertSelective(competeProjectConfig);
} }
// 生成出场顺序表，存入数据库。在tall内添加对应的任务 // 生成出场顺序表，存入数据库。在tall内添加对应的任务
@ -116,6 +116,7 @@ public class CompeteTaskService implements ICompeteTaskService{
* 修改配置时生成出场顺序 * 修改配置时生成出场顺序
*/ */
public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) {
if (ObjectUtil.isNotNull(projectConfig)) { if (ObjectUtil.isNotNull(projectConfig)) {
//查找项目 //查找项目
CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
@ -128,10 +129,15 @@ public class CompeteTaskService implements ICompeteTaskService{
List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
if (CollectionUtil.isNotEmpty(projectPlayerList)) { 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 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; int competeOrder = 1;
//场地 //场地
@ -153,7 +159,9 @@ public class CompeteTaskService implements ICompeteTaskService{
updateTaskInfo.setBeginTime(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getId());
updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
updateTaskInfo.setToken(token); updateTaskInfo.setToken(token);
log.info("修改tall的任务信息：{}",updateTaskInfo);
tallFeignClient.updataTask(updateTaskInfo); tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}",updateTaskInfo);
} }
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
@ -167,7 +175,9 @@ public class CompeteTaskService implements ICompeteTaskService{
addTask.setEndTime(projectStartTime + orderTime); addTask.setEndTime(projectStartTime + orderTime);
addTask.setExecutorId(tallRoleId); addTask.setExecutorId(tallRoleId);
addTask.setToken(token); addTask.setToken(token);
log.info("在tall内添加任务：{}",addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
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)) {
@ -202,10 +212,16 @@ public class CompeteTaskService implements ICompeteTaskService{
List<CompeteTeam> teamList = competeTeamDao.selectByExample(teamExample); List<CompeteTeam> teamList = competeTeamDao.selectByExample(teamExample);
if(CollectionUtil.isNotEmpty(teamList)){ 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 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; int competeOrder = 1;
//场地 //场地
@ -227,7 +243,9 @@ public class CompeteTaskService implements ICompeteTaskService{
updateTaskInfo.setBeginTime(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getId());
updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
updateTaskInfo.setToken(token); updateTaskInfo.setToken(token);
log.info("修改tall的任务信息：{}",updateTaskInfo);
tallFeignClient.updataTask(updateTaskInfo); tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}",updateTaskInfo);
} }
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
@ -241,7 +259,9 @@ public class CompeteTaskService implements ICompeteTaskService{
addTask.setEndTime(projectStartTime + orderTime); addTask.setEndTime(projectStartTime + orderTime);
addTask.setExecutorId(1L); addTask.setExecutorId(1L);
addTask.setToken(token); addTask.setToken(token);
log.info("在tall内添加任务：{}",addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
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)) {
@ -345,9 +365,11 @@ public class CompeteTaskService implements ICompeteTaskService{
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);
JsonResponse<MemberVo.RoleInfo> memberJsonResponse = tallFeignClient.saveRole(saveRole); log.info("在tall内添加角色：{}",saveRole);
if (ObjectUtil.isNotNull(memberJsonResponse)) { JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); log.info("添加角色后返回：{}",roleJsonResponse);
if (ObjectUtil.isNotNull(roleJsonResponse)) {
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
if (ObjectUtil.isNotNull(roleInfo)) { if (ObjectUtil.isNotNull(roleInfo)) {
roleId = roleInfo.getRoleId(); roleId = roleInfo.getRoleId();
} }
@ -359,7 +381,9 @@ public class CompeteTaskService implements ICompeteTaskService{
saveMember.setPhone(judgmentInfo.getJudgmentPhone()); saveMember.setPhone(judgmentInfo.getJudgmentPhone());
saveMember.setRoleId(Arrays.asList(roleId)); saveMember.setRoleId(Arrays.asList(roleId));
saveMember.setToken(token); saveMember.setToken(token);
tallFeignClient.saveMember(saveMember); log.info("在tall内添加成员：{}",saveMember);
JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
log.info("添加成员后返回：{}",memberJsonResponse);
//添加任务 //添加任务
//查找场次信息表 //查找场次信息表
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
@ -377,7 +401,9 @@ public class CompeteTaskService implements ICompeteTaskService{
addTask.setExecutorId(roleId); addTask.setExecutorId(roleId);
addTask.setParentTaskId(startOrder.getTaskId()); addTask.setParentTaskId(startOrder.getTaskId());
addTask.setToken(token); addTask.setToken(token);
log.info("在tall内添加任务：{}",addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
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)) {
@ -386,7 +412,9 @@ public class CompeteTaskService implements ICompeteTaskService{
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);
tallFeignClient.updatePluginConfig(updatePluginConfig); log.info("修改tall内任务插件配置：{}",updatePluginConfig);
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
log.info("修改任务插件配置后返回：{}",pluginVoJsonResponse);
} }
} }
} }

4
tall/src/main/java/com/ccsens/tall/web/TaskController.java
View File

@ -10,6 +10,7 @@ import com.ccsens.util.WebConstant;
import com.ccsens.util.annotation.OperateType; import com.ccsens.util.annotation.OperateType;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
@Slf4j
@Api(tags = "任务相关API" , description = "") @Api(tags = "任务相关API" , description = "")
@RestController @RestController
@RequestMapping("/tasks") @RequestMapping("/tasks")
@ -224,7 +226,7 @@ public class TaskController {
public JsonResponse<TaskVo.NormalTask> addTask(HttpServletRequest request, public JsonResponse<TaskVo.NormalTask> addTask(HttpServletRequest request,
@ApiParam @Validated @RequestBody TaskDto.AddTask addTask) throws Exception { @ApiParam @Validated @RequestBody TaskDto.AddTask addTask) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
log.info("新加任务，userId：{}、任务信息：{}",currentUserId,addTask);
TaskVo.NormalTask normalTask = subTimeService.addTask(currentUserId,addTask); TaskVo.NormalTask normalTask = subTimeService.addTask(currentUserId,addTask);
return JsonResponse.newInstance().ok(normalTask); return JsonResponse.newInstance().ok(normalTask);
} }

Write Preview
Loading…
Cancel
Save