修改比赛日程接口添加项目id

mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java

@@ -45,9 +45,9 @@ public class CompeteTaskController {
     @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" +
                                                         "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务")
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<TableVo.DailyScheduleProcess> updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto<List<ProvinceCompeteDto.UpdateCompeteTask>> params) {
+    public JsonResponse<TableVo.DailyScheduleProcess> updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.UpdateCompeteProjectConfig> params) {
         log.info("日程安排更新：{}",params);
-        List<TableVo.CompeteProjectConfig> dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam());
+        List<TableVo.CompeteProjectConfig> dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam().getUpdateCompeteTaskList());
         log.info("日程安排更新：{}",dailyScheduleProcessList);
         return JsonResponse.newInstance().ok(dailyScheduleProcessList);
     }

mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@@ -136,7 +136,7 @@ public class ProvinceCompeteDto {
     }
 
     @Data
-    @ApiModel("修改日程安排")
+    @ApiModel("修改日程安排111")
     public  static class UpdateAndSearch{
         @ApiModelProperty("项目id")
         private Long projectId;
@@ -199,11 +199,22 @@ public class ProvinceCompeteDto {
         private Long teamId;
     }
 
+
     @Data
     @ApiModel("修改日程安排")
+    public  static class UpdateCompeteProjectConfig{
+        @NotNull
+        @ApiModelProperty("Tall当前项目id")
+        private Long projectId;
+        @ApiModelProperty("单项时间 单位：秒")
+        private List<UpdateCompeteTask> updateCompeteTaskList;
+    }
+
+    @Data
+    @ApiModel("需要修改的日程安排")
     public  static class UpdateCompeteTask{
         @NotNull
-        @ApiModelProperty("项目id")
+        @ApiModelProperty("比赛项目项目id")
         private Long projectId;
         @ApiModelProperty("单项时间 单位：秒")
         private long duration;

mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@@ -121,20 +121,17 @@ public class CompeteTaskService implements ICompeteTaskService{
                     projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId());
                     List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
                     if (CollectionUtil.isNotEmpty(projectPlayerList)) {
+                        //计算场次
+                        int order = (int) Math.ceil(competeProjectConfig.getSiteNum() / projectPlayerList.size());
+
+
                         //场次
                         int competeOrder = 1;
                         //场地
                         int site = 1;
                         for (CompeteProjectPlayer projectPlayer : projectPlayerList) {
-                            //添加出场顺序
+                            //添加出场顺序和tall的任务
-                            CompeteStartOrder competeStartOrder = new CompeteStartOrder();
+                            addStartOrderAndTask(project.getId(), competeOrder, site, projectPlayer.getId(),0);
-                            competeStartOrder.setId(snowflake.nextId());
-                            competeStartOrder.setProjectId(project.getId());
-                            competeStartOrder.setPlayerId(projectPlayer.getId());
-                            competeStartOrder.setTeam((byte) 0);
-                            competeStartOrder.setSite((byte) site);
-                            competeStartOrder.setCompeteOrder((byte) competeOrder);
-                            startOrderMapper.insertSelective(competeStartOrder);
                             site++;
                             if(site > competeProjectConfig.getSiteNum()){
                                 site = 1;
@@ -153,15 +150,8 @@ public class CompeteTaskService implements ICompeteTaskService{
                         //场地
                         int site = 1;
                         for (CompeteTeam competeTeam : teamList) {
-                            //添加出场顺序
+                            //添加出场顺序和tall的任务
-                            CompeteStartOrder competeStartOrder = new CompeteStartOrder();
+                            addStartOrderAndTask(project.getId(), competeOrder, site, competeTeam.getId(),1);
-                            competeStartOrder.setId(snowflake.nextId());
-                            competeStartOrder.setProjectId(project.getId());
-                            competeStartOrder.setPlayerId(competeTeam.getId());
-                            competeStartOrder.setSite((byte) site);
-                            competeStartOrder.setTeam((byte) 1);
-                            competeStartOrder.setCompeteOrder((byte) competeOrder);
-                            startOrderMapper.insertSelective(competeStartOrder);
                             site++;
                             if(site > competeProjectConfig.getSiteNum()){
                                 site = 1;
@@ -174,4 +164,16 @@ public class CompeteTaskService implements ICompeteTaskService{
         }
     }
 
+    private void addStartOrderAndTask(Long projectId, int competeOrder, int site, Long playerOrTeamId,int isTeam) {
+        //添加出场顺序
+        CompeteStartOrder competeStartOrder = new CompeteStartOrder();
+        competeStartOrder.setId(snowflake.nextId());
+        competeStartOrder.setProjectId(projectId);
+        competeStartOrder.setPlayerId(playerOrTeamId);
+        competeStartOrder.setSite((byte) site);
+        competeStartOrder.setTeam((byte) isTeam);
+        competeStartOrder.setCompeteOrder((byte) competeOrder);
+        startOrderMapper.insertSelective(competeStartOrder);
+    }
+
 }