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

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

@@ -3,7 +3,6 @@ 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.CompeteService;
 import com.ccsens.mt.service.ICompeteService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;

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

@@ -84,7 +84,7 @@ public class CompeteScoreController {
     }
 
 
-    @ApiOperation(value = "项目状态", notes = "")
+    @ApiOperation(value = "项目状态（手机用）", notes = "")
     @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<CompeteVo.CountScore> countScore(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
         log.info("查询比赛项目上的参赛选手列表：{}",params);
@@ -93,7 +93,7 @@ public class CompeteScoreController {
     }
 
 
-    @ApiOperation(value = "选手排名", notes = "多个信息表关联之后，利用分数排序")
+    @ApiOperation(value = "选手排名（手机用）", notes = "多个信息表关联之后，利用分数排序")
     @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ScoreVo.CompeteScore> countScoreDetail(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.ProjectIdAndGroupId> params) {
         log.info("查询比赛项目上的参赛选手列表：{}",params);

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

@@ -27,12 +27,18 @@ public class CompeteExcelVo {
     public static class TeamOrderPlayerList {
         @ApiModelProperty("团队id")
         private Long teamId;
-        @ApiModelProperty("场次")
+        @ApiModelProperty("场次加场地")
         private String startOrder;
         @ApiModelProperty("单位名称")
         private String companyName;
         @ApiModelProperty("团队选手名字")
         private String playerName;
+        @ApiModelProperty("视频路径")
+        private String videoUrl;
+        @ApiModelProperty("场次")
+        private String competeOrder;
+        @ApiModelProperty("场地")
+        private String site;
     }
 
     @Data

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

@@ -49,8 +49,10 @@ public class VideoProjectVo {
         private String phone;
         @ApiModelProperty("裁判类型")
         private byte chiefJudgment;
-        @ApiModelProperty("最近签到时间")
+//        @ApiModelProperty("最近签到时间")
-        private Date time;
+//        private Date time;
+        @ApiModelProperty("最近签到时间戳")
+        private Long time;
     }
 
 

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

@@ -1875,7 +1875,6 @@ public class CompeteService implements ICompeteService {
         if (project == null) {
             throw new BaseException(CodeEnum.PARAM_ERROR);
         }
-
         PageHelper.startPage(param.getPageNum(), param.getSize());
         List<ScoreVo.CountScorePublicity> list;
         if (project.getTeam() == Constant.Compete.TEAM_YES) {

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

@@ -628,12 +628,21 @@ public class ExcelService implements IExcelService {
             two5.setValue("参赛单位");
             PoiUtil.PoiUtilCell two6=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
             two6.setValue("参赛人员");
+            PoiUtil.PoiUtilCell two7=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            two7.setValue("比赛视频路径");
+            PoiUtil.PoiUtilCell two8=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            two7.setValue("场次");
+            PoiUtil.PoiUtilCell two9=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+            two7.setValue("场地");
             two.add(two1);
             two.add(two2);
             two.add(two3);
             two.add(two4);
             two.add(two5);
             two.add(two6);
+            two.add(two7);
+            two.add(two8);
+            two.add(two9);
             biao.add(two);
             for (CompeteExcelVo.Project project : allProjectList) {
                 int j = 0, q = 0;//一个项目得长度   项目循环
@@ -675,12 +684,18 @@ public class ExcelService implements IExcelService {
                         PoiUtil.PoiUtilCell three4 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getStartOrder(), 1, 1);
                         PoiUtil.PoiUtilCell three5 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompanyName(), 1, 1);
                         PoiUtil.PoiUtilCell three6 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getPlayerName(), 1, 1);
+                        PoiUtil.PoiUtilCell three7 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getVideoUrl(), 1, 1);
+                        PoiUtil.PoiUtilCell three8 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompeteOrder(), 1, 1);
+                        PoiUtil.PoiUtilCell three9 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getSite(), 1, 1);
                         three.add(three1);
                         three.add(three2);
                         three.add(three3);
                         three.add(three4);
                         three.add(three5);
                         three.add(three6);
+                        three.add(three7);
+                        three.add(three8);
+                        three.add(three9);
                         biao.add(three);
                     }
                 }

mt/src/main/resources/druid-dev.yml

@@ -29,6 +29,7 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
       url: jdbc:mysql://49.233.89.188:3306/mt?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME

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

@@ -237,7 +237,7 @@
     and tcg.rec_status=0
   </select>
     <select id="queryEight" resultType="com.ccsens.mt.bean.vo.CompeteExcelVo$BeforeEight">
-        select groupName, GROUP_CONCAT( NAME )  AS eightNames  from (
+        select groupName, GROUP_CONCAT( NAME order by count )  AS eightNames  from (
         SELECT
         t1.group_name AS groupName,
         t1.name,
@@ -301,7 +301,7 @@
         t1.group_name = t2.group_name
         AND t1.final_score &lt;= t2.final_score
         GROUP BY
-        t1.group_name, t1.name
+        t1.id
         HAVING
         count( t2.id ) &lt;= 8
         ) t
@@ -316,6 +316,7 @@
         CASE team.gender_group	WHEN 0 THEN	'女子组' WHEN 1 THEN	'男子组' ELSE '混合组' END
         ) AS group_name,
         GROUP_CONCAT(player.name SEPARATOR '、') as name,
+        score.id,
         score.final_score
         FROM
         t_compete_count_score score,
@@ -343,6 +344,7 @@
         CASE team.gender_group	WHEN 0 THEN	'女子组' WHEN 1 THEN	'男子组' ELSE '混合组' END
         ) AS group_name,
         GROUP_CONCAT(player.name) as name,
+        score.id,
         score.final_score
         FROM
         t_compete_count_score score,
@@ -366,8 +368,8 @@
         WHERE
         t1.group_name = t2.group_name
         AND t1.final_score &lt;= t2.final_score
-        GROUP BY t1.group_name, t1.name
+        GROUP BY t1.id
-        HAVING count( * ) &lt;= 8) t
+        HAVING count( t2.id ) &lt;= 8) t
         group by t.group_name
     </select>
 
@@ -560,7 +562,7 @@
         having count(t2.groupName) &lt;= 8
     </select>
     <select id="queryCountScoreTeam" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity">
-        select t1.*, count(*) as rangee from
+        select t1.*, count(t2.id) +1 as rangee from
         (SELECT
         CONCAT(
         CASE	team.group_remark WHEN 1 THEN '小学'	WHEN 2 THEN	'中学' WHEN 3 THEN	'高职院校' WHEN 4 THEN	'本科院校' ELSE '俱乐部'END,
@@ -568,6 +570,7 @@
         ) AS groupName,
         GROUP_CONCAT(player.name SEPARATOR '、') as name,
         company.name as companyName,
+        score.id,
         score.judgment_a_score as mainOneScore,
         score.judgment_b_score2 as mainTwoScore,
         score.should_times as shouldScore,
@@ -602,6 +605,7 @@
         ) AS groupName,
         GROUP_CONCAT(player.name SEPARATOR '、') as name,
         company.name as companyName,
+        score.id,
         score.judgment_a_score as mainOneScore,
         score.judgment_b_score2 as mainTwoScore,
         score.should_times as shouldScore,
@@ -631,8 +635,8 @@
         on
         t1.groupName = t2.groupName
         AND t1.finalScore &lt; t2.finalScore
-        GROUP BY t1.groupName, t1.name
+        group by t1.id
-        order by rangee desc
+        order by t1.groupName, rangee
     </select>
     <select id="queryCountScorePerson" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity">
         select t1.*, count(t2.id) + 1 as rangee from
@@ -902,6 +906,9 @@
                 <result column="companyName" property="companyName"/>
                 <result column="playerName" property="playerName"/>
                 <result property="teamId" column="teamId"/>
+                <result property="videoUrl" column="videoUrl"/>
+                <result property="competeOrder" column="competeOrder"/>
+                <result property="site" column="site"/>
             </collection>
         </collection>
     </resultMap>
@@ -925,7 +932,8 @@
         so.compete_order AS competeOrder,
         so.site AS site,
         pc.start_time AS st,
-        pp.id AS teamId
+        pp.id AS teamId,
+		v.video_url as videoUrl
     FROM
         t_compete_project_player pp
         LEFT JOIN t_compete_project p ON p.id = pp.project_id
@@ -934,6 +942,7 @@
         LEFT JOIN t_compete_group g ON g.id = pl.compete_group_id
         LEFT JOIN t_compete_project_config pc ON pc.project_id = p.id
         LEFT JOIN t_compete_start_order so ON pp.id = so.player_id
+        LEFT JOIN t_compete_video v on v.player_id = pp.id and v.rec_status = 0
     WHERE
         p.type = #{type}
         AND p.`level` = 2
@@ -961,7 +970,8 @@
         so.compete_order AS competeOrder,
         so.site AS site,
         pc.start_time AS st,
-        t.id AS teamId
+        t.id AS teamId,
+		v.video_url as videoUrl
     FROM
         t_compete_project p
         LEFT JOIN t_compete_team t ON p.id = t.project_id
@@ -972,6 +982,7 @@
         AND t.group_remark = g.group_remark
         LEFT JOIN t_compete_project_config pc ON pc.project_id = p.id
         LEFT JOIN t_compete_start_order so ON t.id = so.player_id
+        LEFT JOIN t_compete_video v on v.player_id = t.id and v.rec_status = 0
     WHERE
         p.type = #{type}
         AND p.`level` = 2

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

@@ -65,7 +65,8 @@
         tcj.`name` as `name`,
         tcj.`phone` as `phone`,
         tcj.`chief_judgment` as `chiefJudgment`,
-        tt.`cr` as `time`
+        (UNIX_TIMESTAMP(tt.`cr`) * 1000) as `time`
+
        FROM
         t_compete_judgment tcj
         left join tall.t_pro_member ttpm on tcj.member_id=ttpm.id and ttpm.user_id != 0

tall/src/main/resources/druid-dev.yml

@@ -28,6 +28,7 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
       url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+#      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL