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

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java

@@ -95,6 +95,8 @@ public class MemberRoleDto {
         private String stakeholderPhone;
         @ApiModelProperty("奖惩干系人姓名")
         private String stakeholderName;
+        @ApiModelProperty("token")
+        private String token;
     }
 
     @Data
@@ -106,6 +108,8 @@ public class MemberRoleDto {
         @NotEmpty(message = "角色名不能为空")
         @ApiModelProperty("角色名")
         private String roleName;
+        @ApiModelProperty("token")
+        private String token;
     }
 
 }

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java

@@ -44,6 +44,8 @@ public class TallTaskDto {
         private Byte priority;
         @ApiModelProperty("任务提醒消息")
         private TaskRemindByAdd taskRemind;
+        @ApiModelProperty("token")
+        private String token;
     }
 
     @Data
@@ -105,6 +107,8 @@ public class TallTaskDto {
         private Byte milestone;
         @ApiModelProperty("需要修改的插件Id")
         private List<Long> plugins;
+        @ApiModelProperty("token")
+        private String token;
     }
 
     @Data
@@ -123,6 +127,8 @@ public class TallTaskDto {
         private Byte placeLocation;
         @ApiModelProperty("程序位置 0:tall内部，1外部")
         private Byte routineLocation;
+        @ApiModelProperty("token")
+        private String token;
 
         public UpdatePluginConfig() {
         }

cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java

@@ -1,24 +1,27 @@
 package com.ccsens.cloudutil.config;
 
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * @author 逗
  */
+@Component
 public class FeignTokenConfig implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
-        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if(attributes == null){
+        byte[] body = template.body();
+        if (body == null) {
             return;
         }
-        HttpServletRequest request = attributes.getRequest();
+        String json = new String(body);
+        JSONObject jsonObject = JSONUtil.parseObj(json);
+
         //添加token
-        template.header("Authorization", request.getHeader("Authorization"));
+        template.header("Authorization", jsonObject.get("token").toString());
     }
 }

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

@@ -7,6 +7,7 @@ import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.service.ICompeteTaskService;
 import com.ccsens.util.JsonResponse;
+import com.ccsens.util.WebConstant;
 import com.ccsens.util.bean.dto.QueryDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -46,9 +48,11 @@ 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<ProvinceCompeteDto.UpdateCompeteProjectConfig> params) {
+    public JsonResponse<TableVo.DailyScheduleProcess> updateCompeteConfig(
+            @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.UpdateCompeteProjectConfig> params, HttpServletRequest request) {
         log.info("日程安排更新：{}",params);
-        List<TableVo.CompeteProjectConfig> dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam());
+        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        List<TableVo.CompeteProjectConfig> dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam(),authHeader);
         log.info("日程安排更新：{}",dailyScheduleProcessList);
         return JsonResponse.newInstance().ok(dailyScheduleProcessList);
     }
@@ -78,9 +82,10 @@ public class CompeteTaskController {
     @ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表，根据内容给每个的项目的每个场次添加裁判信息")
     @RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<ProvinceCompeteVo.QueryJudgment>> allocationJudgment(
-            @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.AllocationJudgmentAndTall> params) {
+            @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.AllocationJudgmentAndTall> params, HttpServletRequest request) {
         log.info("分配裁判信息：{}",params);
-        List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeTaskService.allocationJudgment(params.getParam());
+        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeTaskService.allocationJudgment(params.getParam(),authHeader);
         log.info("分配裁判信息：{}",queryJudgmentList);
         return JsonResponse.newInstance().ok(queryJudgmentList);
     }

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

@@ -76,7 +76,7 @@ public class CompeteVideoController {
     @MustLogin
     @ApiOperation(value = "查看所有二级比赛项目", notes = "Mr.王---------去那个competeProject表下面查")
     @RequestMapping(value = "/selectTwoProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<VideoProjectVo.GetTwoProject>> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTwoProject > params) {
+    public JsonResponse<List<VideoProjectVo.GetTwoProject>> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTwoProject> params) {
 
         log.info("添加用户观看开幕式视频记录（签到用）:{}",params);
         List<VideoProjectVo.GetTwoProject> list=iCompeteVedioService.selectTwoProject(params);

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

@@ -206,6 +206,9 @@ public class ProvinceCompeteDto {
         @NotNull
         @ApiModelProperty("Tall当前项目id")
         private Long projectId;
+        @NotNull
+        @ApiModelProperty("Tall内当前角色id")
+        private Long tallRoleId;
         @ApiModelProperty("单项时间 单位：秒")
         private List<UpdateCompeteTask> updateCompeteTaskList;
     }
@@ -219,7 +222,7 @@ public class ProvinceCompeteDto {
         @ApiModelProperty("单项时间 单位：秒")
         private long duration;
         @ApiModelProperty("场地数量")
-        private int siteNum;
+        private int siteNum = 1;
         @ApiModelProperty("项目开始时间")
         private Long startTime;
         @ApiModelProperty("项目结束时间")

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

@@ -72,7 +72,7 @@ public class CompeteTaskService implements ICompeteTaskService{
      * 修改项目的日程配置
      */
     @Override
-    public List<TableVo.CompeteProjectConfig> updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param) {
+    public List<TableVo.CompeteProjectConfig> updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token) {
         //获取比赛类型
         AtomicInteger type = new AtomicInteger();
         if(CollectionUtil.isNotEmpty(param.getUpdateCompeteTaskList())){
@@ -106,8 +106,8 @@ public class CompeteTaskService implements ICompeteTaskService{
                     competeProjectConfig.setEndTime(projectConfig.getEndTime());
                     projectConfigDao.insertSelective(competeProjectConfig);
                 }
-                // TODO 生成出场顺序表，存入数据库。在tall内添加对应的任务
-                setStartOrder(competeProjectConfig,param.getProjectId());
+                // 生成出场顺序表，存入数据库。在tall内添加对应的任务
+                setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token);
             });
         }
         return projectConfigDao.queryProjectConfig(type.get());
@@ -115,7 +115,7 @@ public class CompeteTaskService implements ICompeteTaskService{
     /**
      * 修改配置时生成出场顺序
      */
-    public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId) {
+    public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) {
         if (ObjectUtil.isNotNull(projectConfig)) {
             //查找项目
             CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
@@ -147,11 +147,12 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
                                     competeStartOrder.setStartTime(projectStartTime);
                                     competeStartOrder.setEndTime(projectStartTime + orderTime);
-                                    // TODO 修改tall的任务
+                                    // 修改tall的任务
                                     TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
                                     updateTaskInfo.setId(competeStartOrder.getId());
                                     updateTaskInfo.setBeginTime(competeStartOrder.getId());
                                     updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
+                                    updateTaskInfo.setToken(token);
                                     tallFeignClient.updataTask(updateTaskInfo);
                                 }
                                 startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
@@ -164,7 +165,8 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 addTask.setTaskName(project.getName() + competeOrder +"-" + site);
                                 addTask.setBeginTime(projectStartTime);
                                 addTask.setEndTime(projectStartTime + orderTime);
-                                addTask.setExecutorId(1L);
+                                addTask.setExecutorId(tallRoleId);
+                                addTask.setToken(token);
                                 JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
                                 if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
                                     TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
@@ -219,11 +221,12 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){
                                     competeStartOrder.setStartTime(projectStartTime);
                                     competeStartOrder.setEndTime(projectStartTime + orderTime);
-                                    // TODO 修改tall的任务
+                                    //修改tall的任务
                                     TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo();
                                     updateTaskInfo.setId(competeStartOrder.getId());
                                     updateTaskInfo.setBeginTime(competeStartOrder.getId());
                                     updateTaskInfo.setBeginTime(competeStartOrder.getEndTime());
+                                    updateTaskInfo.setToken(token);
                                     tallFeignClient.updataTask(updateTaskInfo);
                                 }
                                 startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
@@ -237,6 +240,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 addTask.setBeginTime(projectStartTime);
                                 addTask.setEndTime(projectStartTime + orderTime);
                                 addTask.setExecutorId(1L);
+                                addTask.setToken(token);
                                 JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
                                 if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
                                     TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
@@ -291,7 +295,7 @@ public class CompeteTaskService implements ICompeteTaskService{
      * 分配裁判
      */
     @Override
-    public List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param) {
+    public List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token) {
         //查找项目
         if(CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())){
             for(ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) {
@@ -301,7 +305,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                         allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> {
                             if (ObjectUtil.isNotNull(siteJudgment)) {
                                 siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> {
-                                    saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo);
+                                    saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo,token);
                                 });
                             }
                         });
@@ -316,7 +320,7 @@ public class CompeteTaskService implements ICompeteTaskService{
      * 添加裁判信息和tall内的角色成员任务
      */
     private void saveJudgmentAndTask(Long competeTimeId,Long tallProjectId,CompeteProject project
-            , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo) {
+            , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo,String token) {
         // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息
         //添加裁判信息
         CompeteJudgment competeJudgment = new CompeteJudgment();
@@ -340,6 +344,7 @@ public class CompeteTaskService implements ICompeteTaskService{
         }
         saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum);
         Long roleId = null;
+        saveRole.setToken(token);
         JsonResponse<MemberVo.RoleInfo> memberJsonResponse = tallFeignClient.saveRole(saveRole);
         if (ObjectUtil.isNotNull(memberJsonResponse)) {
             MemberVo.RoleInfo roleInfo = memberJsonResponse.getData();
@@ -353,6 +358,7 @@ public class CompeteTaskService implements ICompeteTaskService{
         saveMember.setProjectId(tallProjectId);
         saveMember.setPhone(judgmentInfo.getJudgmentPhone());
         saveMember.setRoleId(Arrays.asList(roleId));
+        saveMember.setToken(token);
         tallFeignClient.saveMember(saveMember);
         //添加任务
         //查找场次信息表
@@ -370,7 +376,19 @@ public class CompeteTaskService implements ICompeteTaskService{
                 addTask.setEndTime(startOrder.getEndTime());
                 addTask.setExecutorId(roleId);
                 addTask.setParentTaskId(startOrder.getTaskId());
-                tallFeignClient.saveTask(addTask);
+                addTask.setToken(token);
+                JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
+                if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
+                    TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
+                    if (ObjectUtil.isNotNull(normalTask)) {
+                        //修改任务插件配置信息
+                        TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig();
+                        updatePluginConfig.setWebPath("/home/osct/video-score");
+                        updatePluginConfig.setTaskId(normalTask.getDetailId());
+                        updatePluginConfig.setToken(token);
+                        tallFeignClient.updatePluginConfig(updatePluginConfig);
+                    }
+                }
             }
         }
     }

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

@@ -4,6 +4,8 @@ import cn.hutool.core.lang.Snowflake;
 import com.ccsens.mt.bean.dto.VideoDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.VideoProjectVo;
+import com.ccsens.mt.persist.dao.CompeteTeamDao;
+import com.ccsens.mt.persist.dao.CompeteTimeDao;
 import com.ccsens.mt.persist.dao.CompeteVideoDao;
 import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
 import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper;
@@ -40,6 +42,8 @@ public class CompeteVedioService implements ICompeteVedioService{
     private CompeteCompanyMapper competeCompanyMapper;
     @Resource
     private CompeteVideoDao competeVideoDao;
+    @Resource
+    private CompeteTimeDao competeTimeDao;
 
     @Override
     public void insertSignVideo(Long companyId) {
@@ -77,8 +81,9 @@ public class CompeteVedioService implements ICompeteVedioService{
 
     @Override
     public List<VideoProjectVo.GetTwoProject> selectTwoProject(QueryDto<VideoDto.GetTwoProject> params) {
+        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getParam().getTeamId());
         CompeteProjectExample competeCompanyExample=new CompeteProjectExample();
-        competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()).andLevelEqualTo((byte) 2);
+        competeCompanyExample.createCriteria().andTypeEqualTo(competeTime.getType()).andLevelEqualTo((byte) 2);
         List<CompeteProject> list=competeProjectMapper.selectByExample(competeCompanyExample);
         List<VideoProjectVo.GetTwoProject> list1=new ArrayList<>();
         list.forEach(mes->{

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

@@ -16,7 +16,7 @@ public interface ICompeteTaskService {
      * @param param
      * @return
      */
-    List<TableVo.CompeteProjectConfig> updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param);
+    List<TableVo.CompeteProjectConfig> updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token);
 
     /**
      * 查找所有项目的日程配置
@@ -44,5 +44,5 @@ public interface ICompeteTaskService {
      * @param param
      * @return
      */
-    List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param);
+    List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token);
 }

tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java

@@ -39,7 +39,7 @@ public class ProjectMessageVo {
         private Byte readStatus;
         @ApiModelProperty("消息内容")
         List<MessageVo.Message> messages;
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT-5")
+        @JsonFormat(pattern="yyyy-MM-dd HH:mm")
         @ApiModelProperty("发送时间")
         private Date createTime;
     }

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common