From e32effc1c139691fb64e1eb9a457dfb04c1478bb Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 17 Nov 2020 17:23:44 +0800
Subject: [PATCH] 20201117v1.5

---
 .../mt/bean/dto/ProvinceCompeteDto.java       |  4 ++--
 .../ccsens/mt/service/CompeteTaskService.java | 21 ++++++++++---------
 tall/src/main/resources/application.yml       |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

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 ad5b8548..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,14 +129,14 @@ public class CompeteTaskService implements ICompeteTaskService{
                     List<CompeteProjectPlayer> 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 = 0;
-                        if(order == 0) {
+                        if(order != 0) {
                             orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
                         }else {
-                            log.info("场次为0的比赛：{}",project);
+                            log.info("场次为0的比赛：{}------{}",project,projectConfig);
                         }
                         //场次
                         int competeOrder = 1;
@@ -211,14 +212,14 @@ public class CompeteTaskService implements ICompeteTaskService{
                     List<CompeteTeam> 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 = 0;
-                        if(order == 0) {
+                        if(order != 0) {
                             orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
                         }else {
-                            log.info("场次为0的比赛：{}",project);
+                            log.info("场次为0的比赛：{}------{}",project,projectConfig);
                         }
 //                        long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
                         //场次
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common