11-21-1

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -171,6 +171,7 @@ public class AbnormalService implements IAbnormalService {
         AbnormalDto.AbnormalStatisticsDto abnormalDto = params.getParam();
 
         PageHelper.startPage(abnormalDto.getPage(), abnormalDto.getPageSize());
+
         List<AbnormalVo.AbnormalStatisticsVo> abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType());
 
         return new PageInfo<>(abnormalList);

ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@@ -163,6 +163,7 @@ public class PatientReportService implements IPatientReportService {
         List<PatientReportVo.ReportName> reportVos = new ArrayList<>();
         //分页查询报告单列表
         PageHelper.startPage(query.getPageNum(), query.getPageSize());
+
         HtPatientReportExample reportExample = new HtPatientReportExample();
         //查询医生信息
         HtDoctorExample doctorExample = new HtDoctorExample();

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.spring.web.json.Json;
 
 import javax.annotation.Resource;
 import java.io.IOException;

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

@@ -4,6 +4,7 @@ package com.ccsens.mt.api;
 import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
+import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.service.IExcelService;
 import com.ccsens.util.JsonResponse;
@@ -131,4 +132,13 @@ public class ExcelController {
         String path = excelService.schedulePlanningOut(params.getParam());
         return JsonResponse.newInstance().ok(path);
     }
+    @MustLogin
+    @ApiOperation(value = "花样赛成绩导出（导出）", notes = "")
+    @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params) {
+        log.info("参赛人数统计表：{}",params);
+        String path = excelService.patternExpTable(params.getParam());
+        return JsonResponse.newInstance().ok(path);
+    }
+
 }

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

@@ -0,0 +1,48 @@
+package com.ccsens.mt.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.mt.bean.dto.CompeteDto;
+import com.ccsens.mt.bean.vo.CompeteVo;
+import com.ccsens.mt.service.IKCPlayerService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = "云点播", description = "")
+@RestController
+@RequestMapping("/kcPlayer")
+public class KCPlayerController {
+    @Resource
+    private IKCPlayerService kcPlayerService;
+
+    @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回")
+    @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<String> getSignature(Long id) {
+        log.info("查看云点播签名");
+        String signature = kcPlayerService.getSignature(id);
+        log.info("查看云点播签名：{}",signature);
+        return JsonResponse.newInstance().ok(signature);
+    }
+
+    @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回")
+    @RequestMapping(value = "/receive", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse receive(@RequestBody Map map) {
+        log.info("接受文件上传通知：{}",map);
+
+        return JsonResponse.newInstance().ok();
+    }
+
+}

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -468,7 +468,7 @@ public class CompeteVo {
 
     @ApiModel("花样赛总成绩")
     public static class TotalScoreDisplay{
-        @ApiModelProperty("项目名")
+        @ApiModelProperty("单位名")
         public String companyName;
         @ApiModelProperty("参赛队员名")
         public String peopleName;

mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java

@@ -141,7 +141,7 @@ public class TableVo {
     public  static  class CompeteProjectConfig{
         @ApiModelProperty("参赛id")
         private Long projectId;
-        @ApiModelProperty("参赛项目")
+        @ApiModelProperty("参赛项目名字")
         private String projectName;
         @ApiModelProperty("参赛人/队伍")
         private int joinNum;
@@ -153,9 +153,9 @@ public class TableVo {
         private int games;
         @ApiModelProperty("总时间")
         private int timeSum;
-        @ApiModelProperty("项目开始时间")
+        @ApiModelProperty("比赛项目开始时间")
         private Long startTime;
-        @ApiModelProperty("项目结束时间")
+        @ApiModelProperty("比赛项目结束时间")
         private Long endTime;
 
         public int getGames(){

mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 @Data
 public class VideoProjectVo {
 
@@ -48,7 +50,7 @@ public class VideoProjectVo {
         @ApiModelProperty("裁判类型")
         private byte chiefJudgment;
         @ApiModelProperty("最近签到时间")
-        private Long time;
+        private Date time;
     }
 
 

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

@@ -1475,6 +1475,9 @@ public class CompeteService implements ICompeteService {
 
         //场次表里面的东西
         CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId());
+        if(competeStartOrder1==null){
+            throw new BaseException(CodeEnum.PARAM_ERROR);
+        }
         selScropeVo.setWaiver(competeStartOrder1.getWaiver());
         //项目表里面的东西
         CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(competeStartOrder1.getProjectId());

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

@@ -75,8 +75,14 @@ public class CompeteTaskService implements ICompeteTaskService{
     public List<TableVo.CompeteProjectConfig> updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token) {
         //获取比赛类型
         AtomicInteger type = new AtomicInteger();
-        if(CollectionUtil.isNotEmpty(param.getUpdateCompeteTaskList())){
+        if(CollectionUtil.isEmpty(param.getUpdateCompeteTaskList())) {
+            return new ArrayList<>();
+        }
             param.getUpdateCompeteTaskList().forEach(projectConfig -> {
+                //判断时间和时长是否正确
+                if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){
+                    return;
+                }
                 //获取项目
                 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
                 if(ObjectUtil.isNotNull(project)){
@@ -106,17 +112,16 @@ public class CompeteTaskService implements ICompeteTaskService{
                     competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime());
                     projectConfigDao.insertSelective(competeProjectConfig);
                 }
-                // 生成出场顺序表，存入数据库。在tall内添加对应的任务
+                 //生成出场顺序表，存入数据库。在tall内添加对应的任务
                 setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token);
             });
-        }
+
         return projectConfigDao.queryProjectConfig(type.get());
     }
     /**
      * 修改配置时生成出场顺序
      */
     public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) {
-
         if (ObjectUtil.isNotNull(projectConfig)) {
             //查找项目
             CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
@@ -131,7 +136,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                         //计算场次
                         int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum());
                         //计算每个场次时间
-                        long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME;
+                        long projectStartTime = projectConfig.getStartTime();
                         long orderTime = 0;
                         if(order != 0) {
                             orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);
@@ -156,12 +161,16 @@ public class CompeteTaskService implements ICompeteTaskService{
                                     // 修改tall的任务
                                     TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
                                     updateTaskInfo.setId(competeStartOrder.getId());
-                                    updateTaskInfo.setBeginTime(competeStartOrder.getId());
-                                    updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
+                                    updateTaskInfo.setBeginTime(competeStartOrder.getStartTime());
+                                    updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
                                     updateTaskInfo.setToken(token);
                                     log.info("修改tall的任务信息：{}",updateTaskInfo);
-                                    tallFeignClient.updataTask(updateTaskInfo);
-                                    log.info("修改tall的任务信息后返回：{}",updateTaskInfo);
+                                    JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
+                                    log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
+                                    //失败return
+                                    if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
+                                        return;
+                                    }
                                 }
                                 startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
 
@@ -177,12 +186,14 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 addTask.setToken(token);
                                 log.info("在tall内添加任务：{}",addTask);
                                 JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
+                                //异常return
                                 log.info("添加任务后返回：{}",normalTaskJsonResponse);
-                                if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
-                                    TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
-                                    if (ObjectUtil.isNotNull(normalTask)) {
-                                        taskId = normalTask.getDetailId();
-                                    }
+                                if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
+                                    return;
+                                }
+                                TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
+                                if (ObjectUtil.isNotNull(normalTask)) {
+                                    taskId = normalTask.getDetailId();
                                 }
                                 //添加出场顺序信息
                                 CompeteStartOrder competeStartOrder = new CompeteStartOrder();
@@ -192,7 +203,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 competeStartOrder.setSite((byte) site);
                                 competeStartOrder.setTeam((byte) 0);
                                 competeStartOrder.setCompeteOrder((byte) competeOrder);
-                                competeStartOrder.setTaskId(taskId);
+//                                competeStartOrder.setTaskId(taskId);
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
                                 startOrderMapper.insertSelective(competeStartOrder);
@@ -218,10 +229,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                         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;
                         //场地
@@ -244,8 +252,12 @@ public class CompeteTaskService implements ICompeteTaskService{
                                     updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
                                     updateTaskInfo.setToken(token);
                                     log.info("修改tall的任务信息：{}",updateTaskInfo);
-                                    tallFeignClient.updataTask(updateTaskInfo);
-                                    log.info("修改tall的任务信息后返回：{}",updateTaskInfo);
+                                    JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
+                                    log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse);
+                                    //失败return
+                                    if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){
+                                        return;
+                                    }
                                 }
                                 startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
 
@@ -262,11 +274,14 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 log.info("在tall内添加任务：{}",addTask);
                                 JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
                                 log.info("添加任务后返回：{}",normalTaskJsonResponse);
-                                if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
-                                    TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
-                                    if (ObjectUtil.isNotNull(normalTask)) {
-                                        taskId = normalTask.getDetailId();
-                                    }
+                                //异常return
+                                log.info("添加任务后返回：{}",normalTaskJsonResponse);
+                                if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
+                                    return;
+                                }
+                                TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
+                                if (ObjectUtil.isNotNull(normalTask)) {
+                                    taskId = normalTask.getDetailId();
                                 }
                                 //添加出场顺序信息
                                 CompeteStartOrder competeStartOrder = new CompeteStartOrder();
@@ -276,7 +291,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 competeStartOrder.setSite((byte) site);
                                 competeStartOrder.setTeam((byte) 0);
                                 competeStartOrder.setCompeteOrder((byte) competeOrder);
-                                competeStartOrder.setTaskId(taskId);
+//                                competeStartOrder.setTaskId(taskId);
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
                                 startOrderMapper.insertSelective(competeStartOrder);
@@ -407,6 +422,8 @@ 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);

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

@@ -5,8 +5,10 @@ import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
+import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.CompeteExcelVo;
+import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
@@ -84,6 +86,9 @@ public class ExcelService implements IExcelService {
     @Resource
     private  CompeteProjectDao competeProjectDao;
 
+    @Resource
+    private ICompeteService competeService;
+    
     @Override
     public String dasaiduiwuxinxiWPS(QueryDto<CompeteDto.CompeteTime> params) {
         //这个里面包含联系人得信息
@@ -226,7 +231,7 @@ public class ExcelService implements IExcelService {
             //查出教练和领队的list
             List<CompeteCoach> jLandLD=competeCompanyDao.selectByCompanyId(com.getId());
             CompetePlayerExample competePlayerExample=new CompetePlayerExample();
-            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId());
+            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0);
             //运动员list
             List<CompetePlayer> competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);
 
@@ -1321,5 +1326,48 @@ public class ExcelService implements IExcelService {
 
 
 
+
+    public String patternExpTable(ScoreDto.ShowResult param) {
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResult(param);
+        List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
+        List<PoiUtil.PoiUtilCell> one=new ArrayList<>();
+        PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1);
+        PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1);
+        PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1);
+        PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1);
+        PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1);
+        PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 1);
+        PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 1);
+        PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("最后得分", 1, 1);
+        PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("名次", 1, 1);
+        PoiUtil.PoiUtilCell oneTen=new PoiUtil.PoiUtilCell("备注", 1, 1);
+        one.add(oneOne);
+        one.add(oneTwo);
+        one.add(oneThree);
+        one.add(oneFour);
+        one.add(oneFive);
+        one.add(oneSix);
+        one.add(oneSeven);
+        one.add(oneEight);
+        one.add(oneNine);
+        one.add(oneTen);
+        list.add(one);
+        List<PoiUtil.PoiUtilCell> two=new ArrayList<>();
+        PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell();
+        PoiUtil.PoiUtilCell twoTwo=new PoiUtil.PoiUtilCell();
+        PoiUtil.PoiUtilCell twoThree=new PoiUtil.PoiUtilCell("1", 1, 1);
+        PoiUtil.PoiUtilCell twoFour=new PoiUtil.PoiUtilCell("2", 1, 1);
+        PoiUtil.PoiUtilCell twoFive=new PoiUtil.PoiUtilCell("3", 1, 1);
+        PoiUtil.PoiUtilCell twoSix=new PoiUtil.PoiUtilCell();
+        PoiUtil.PoiUtilCell twoSeven=new PoiUtil.PoiUtilCell("1", 1, 1);
+        PoiUtil.PoiUtilCell twoEight=new PoiUtil.PoiUtilCell("2", 1, 1);
+        PoiUtil.PoiUtilCell twoNight=new PoiUtil.PoiUtilCell("3", 1, 1);
+        two.add(twoOne);
+        two.add(twoTwo);
+        two.add(twoThree);
+        two.add(twoFour);
+        return null;
+    }
+
 }
 

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

@@ -2,6 +2,7 @@ package com.ccsens.mt.service;
 
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
+import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.mt.bean.dto.CompeteDto;
@@ -97,4 +98,5 @@ public interface IExcelService {
 
 
 
+    String patternExpTable(ScoreDto.ShowResult param);
 }

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

@@ -0,0 +1,5 @@
+package com.ccsens.mt.service;
+
+public interface IKCPlayerService {
+    String getSignature(Long id);
+}

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

@@ -0,0 +1,54 @@
+package com.ccsens.mt.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.mt.util.Constant;
+import com.ccsens.util.CodeEnum;
+import com.ccsens.util.KCPlayerSignature;
+import com.ccsens.util.RedisUtil;
+import com.ccsens.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Random;
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class KCPlayerService implements IKCPlayerService{
+    @Resource
+    private RedisUtil redisUtil;
+
+    /**
+     * 获取云点播签名
+     * @return 返回签名
+     * @param id
+     */
+    @Override
+    public String getSignature(Long id) {
+        String signature;
+        //查询redis
+        Object o = redisUtil.get(Constant.Redis.KC_PLAYER_SIGNATURE + id);
+        if(ObjectUtil.isNotNull(o)){
+            return (String) o;
+        }
+
+        KCPlayerSignature sign = new KCPlayerSignature();
+        sign.setCurrentTime(System.currentTimeMillis() / 1000);
+        sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE));
+        // 签名有效期：2天
+        sign.setSignValidDuration(3600 * 24 * 2);
+        try {
+            signature = sign.getUploadSignature(id);
+            log.info("获取云点播签名成功：{}",signature);
+            //存入redis
+            redisUtil.set(Constant.Redis.KC_PLAYER_SIGNATURE + id,signature,3600 * 24);
+        } catch (Exception e) {
+            log.error("获取云点播签名失败",e);
+            throw new BaseException(CodeEnum.SYS_ERROR);
+
+        }
+        return signature;
+    }
+}

mt/src/main/java/com/ccsens/mt/util/Constant.java

@@ -31,6 +31,8 @@ public class Constant {
         public final static long COMPETE_COMPANY_TIME = 10 * 24 * 60 * 60;
         // 远程比赛参赛单位
         public final static String COMPETE_LEVEL = "compete_";
+        //云点播签名
+        public final static String KC_PLAYER_SIGNATURE = "kc_player_signature_";
     }
 
     public static final int VOTE_TOTAL = 2;

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -290,17 +290,19 @@
       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
               pp.project_id as projectId
               FROM
               t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id
+              LEFT JOIN t_compete_company c on pl.company_id = c.id
               WHERE
               pp.rec_status = 0
               and pl .rec_status = 0
-
+              and c.rec_status = 0
           )a on a.projectId = p.id
           LEFT JOIN
           (
@@ -309,15 +311,18 @@
               FROM
               t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
               LEFT JOIN t_compete_player pl on m.player_id = pl.id
+              LEFT JOIN t_compete_company c on t.company_id = c.id
               WHERE
               t.rec_status = 0
               and m .rec_status = 0
               and pl .rec_status = 0
+              and c.rec_status = 0
               GROUP BY t.id
           )b on b.projectId = p.id
       WHERE
       p.type = #{type}
       and p.`level` = 2
+      and p.certificate = 0
       and p.rec_status = 0
       GROUP BY p.id
     </select>

mt/src/main/resources/mapper_dao/CompeteTimeDao.xml

@@ -49,6 +49,7 @@
             rec_status = 0
         and
             type = #{type}
+        and sex < 2
         ORDER BY sequence
     </select>
 

mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

@@ -14,16 +14,16 @@
        select company_id,max(look_time) as `look_time`
        FROM t_compete_player_look
        where `rec_status`=0
-       <if test="param.signEndTime!=null">
+       <if test="param.signEndTime!=null and param.signEndTime!=0">
         and  t_compete_player_look.`look_time` &lt;= #{param.signEndTime}
        </if>
     ) tcpl on tcpl.company_id=tcc.id
     where
     tct.id= #{param.id}
-    <if test="param.name!=null">
+    <if test="param.name!=null and param.name!=''">
         and tcc.`name`=#{param.name}
     </if>
-    <if test="param.phone!=null">
+    <if test="param.phone!=null and param.phone!=''">
         and tcc.`contacts_name`=#{param.phone}
     </if>
     and tcc.`rec_status`=0
@@ -43,17 +43,17 @@
          user_id
          From tall.t_sys_log
          where `url`='/users/signin' and `rec_status`=0
-        <if test="param.signEndTime!=null">
+        <if test="param.signEndTime!=null and param.signEndTime!=0">
             and  tall.t_sys_log.created_at &lt;= #{param.signEndTime}
         </if>
         ) tt on tt.`user_id`=tcj.`user_id`
         LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id`
         WHERE
         tct.id=#{param.id}
-        <if test="param.name!=null">
+        <if test="param.name!=null and param.name!=''">
          and tcj.`name`=#{param.name}
         </if>
-        <if test="param.phone!=null">
+        <if test="param.phone!=null and param.phone!='' ">
          and tcj.`phone`=#{param.phone}
         </if>
         and tcj.`rec_status`=0

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -26,6 +26,7 @@ import com.ccsens.util.WebConstant;
 import com.ccsens.util.cron.CronConstant;
 import com.ccsens.util.cron.NatureToDate;
 import com.ccsens.util.exception.BaseException;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -282,6 +283,9 @@ public class ProTaskDetailService implements IProTaskDetailService {
         proTaskDetailExample.setOrderByClause("begin_time");
         List<ProTaskDetail> firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
         PageInfo pageInfo = new PageInfo<>(firstTaskDetailList);
+
+
+
         if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
             int sequence = 1;
             for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {

util/src/main/java/com/ccsens/util/KCPlayerSignature.java

@@ -0,0 +1,104 @@
+package com.ccsens.util;
+
+
+import java.util.Base64;
+import java.util.Random;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
+
+/**
+ * 签名工具类
+ * @author 逗
+ */
+public class KCPlayerSignature{
+    private String secretId =  "AKIDTr6B7uA2qCRWRDRXyeUAZpkfR2tupVFu";
+    private String secretKey = "wVtKAuXEjXFpxQmz9PM6hWallNEyZ0Na";
+    private long currentTime;
+    private int random;
+    private int signValidDuration;
+    //签名算法
+    private static final String HMAC_ALGORITHM = "HmacSHA1";
+    private static final String CONTENT_CHARSET = "UTF-8";
+
+    public static byte[] byteMerger(byte[] byte1, byte[] byte2) {
+        byte[] byte3 = new byte[byte1.length + byte2.length];
+        System.arraycopy(byte1, 0, byte3, 0, byte1.length);
+        System.arraycopy(byte2, 0, byte3, byte1.length, byte2.length);
+        return byte3;
+    }
+
+    // 获取签名
+    public String getUploadSignature(Long id) throws Exception {
+        String strSign = "";
+        String contextStr = "";
+
+        // 生成原始参数字符串
+        long endTime = (currentTime + signValidDuration);
+        contextStr += "secretId=" + java.net.URLEncoder.encode(secretId, "utf8");
+        contextStr += "&currentTimeStamp=" + currentTime;
+        contextStr += "&expireTime=" + endTime;
+        contextStr += "&random=" + random;
+        contextStr += "&sourceContext=" + id;
+
+
+        try {
+            Mac mac = Mac.getInstance(HMAC_ALGORITHM);
+            SecretKeySpec secretKey = new SecretKeySpec(this.secretKey.getBytes(CONTENT_CHARSET), mac.getAlgorithm());
+            mac.init(secretKey);
+
+            byte[] hash = mac.doFinal(contextStr.getBytes(CONTENT_CHARSET));
+            byte[] sigBuf = byteMerger(hash, contextStr.getBytes("utf8"));
+            strSign = base64Encode(sigBuf);
+            strSign = strSign.replace(" ", "").replace("\n", "").replace("\r", "");
+        } catch (Exception e) {
+            throw e;
+        }
+        return strSign;
+    }
+
+    private String base64Encode(byte[] buffer) {
+        Base64.Encoder encoder = Base64.getEncoder();
+        return encoder.encodeToString(buffer);
+    }
+
+
+    public void setSecretId(String secretId) {
+        this.secretId = secretId;
+    }
+
+    public void setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public void setCurrentTime(long currentTime) {
+        this.currentTime = currentTime;
+    }
+
+    public void setRandom(int random) {
+        this.random = random;
+    }
+
+    public void setSignValidDuration(int signValidDuration) {
+        this.signValidDuration = signValidDuration;
+    }
+
+     static void main(String[] args) {
+//        KCPlayerSignature sign = new KCPlayerSignature();
+//        // 设置 App 的云 API 密钥
+//        sign.setSecretId("个人 API 密钥中的 Secret Id");
+//        sign.setSecretKey("个人 API 密钥中的 Secret Key");
+//        sign.setCurrentTime(System.currentTimeMillis() / 1000);
+//        sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE));
+//        // 签名有效期：2天
+//        sign.setSignValidDuration(3600 * 24 * 2);
+//
+//        try {
+//            String signature = sign.getUploadSignature(id);
+//            System.out.println("signature : " + signature);
+//        } catch (Exception e) {
+//            System.out.print("获取签名失败");
+//            e.printStackTrace();
+//        }
+    }
+}