From eeb6e830e73750ff20b36d7e8c8dc67fdc6ca0ef Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 27 Nov 2020 19:16:54 +0800 Subject: [PATCH 1/3] 20201127v1.7 --- .../java/com/ccsens/mt/api/CompeteCompanyController.java | 1 - .../main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java | 2 ++ .../main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java | 6 ++++-- .../main/java/com/ccsens/mt/service/CompeteService.java | 1 - mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 5 +++++ mt/src/main/resources/druid-dev.yml | 1 + mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 9 +++++++-- mt/src/main/resources/mapper_dao/CompeteVideoDao.xml | 3 ++- tall/src/main/resources/application.yml | 4 ++-- tall/src/main/resources/druid-dev.yml | 1 + 10 files changed, 24 insertions(+), 9 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java index ea6506d0..c33a6cc8 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java +++ b/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; diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java index 00f8b89a..97411957 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java @@ -33,6 +33,8 @@ public class CompeteExcelVo { private String companyName; @ApiModelProperty("团队选手名字") private String playerName; + @ApiModelProperty("视频路径") + private String videoUrl; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index e185a41c..51ca828b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/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("最近签到时间") - private Date time; +// @ApiModelProperty("最近签到时间") +// private Date time; + @ApiModelProperty("最近签到时间戳") + private Long time; } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index d4d6e19d..69a2a8dd 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1874,7 +1874,6 @@ public class CompeteService implements ICompeteService { if (project == null) { throw new BaseException(CodeEnum.PARAM_ERROR); } - PageHelper.startPage(param.getPageNum(), param.getSize()); List list; if (project.getTeam() == Constant.Compete.TEAM_YES) { diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index f9cc1991..ad5592a1 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -628,12 +628,15 @@ 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("比赛视频路径"); two.add(two1); two.add(two2); two.add(two3); two.add(two4); two.add(two5); two.add(two6); + two.add(two7); biao.add(two); for (CompeteExcelVo.Project project : allProjectList) { int j = 0, q = 0;//一个项目得长度 项目循环 @@ -675,12 +678,14 @@ 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); three.add(three1); three.add(three2); three.add(three3); three.add(three4); three.add(three5); three.add(three6); + three.add(three7); biao.add(three); } } diff --git a/mt/src/main/resources/druid-dev.yml b/mt/src/main/resources/druid-dev.yml index 8b496426..cf6c32d9 100644 --- a/mt/src/main/resources/druid-dev.yml +++ b/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 diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index d70632ec..8bd83ab9 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -902,6 +902,7 @@ + @@ -925,7 +926,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 +936,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 +964,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 +976,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 diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 8c17e5ee..3af74d5e 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/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 diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index e75cc2c3..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: util-prod,common + active: dev + include: util-dev,common diff --git a/tall/src/main/resources/druid-dev.yml b/tall/src/main/resources/druid-dev.yml index 9b9ea832..109ec223 100644 --- a/tall/src/main/resources/druid-dev.yml +++ b/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 \ No newline at end of file From 22657af2241e48ece14480807a7d36298cf1c418 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 27 Nov 2020 20:05:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A1=E6=95=B0=E8=B5=9B=E5=9B=A2?= =?UTF-8?q?=E4=BD=93=E8=B5=9B=E5=88=86=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper_dao/CompeteScoreDao.xml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 8bd83ab9..e296faad 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -237,7 +237,7 @@ and tcg.rec_status=0 @@ -560,7 +562,7 @@ having count(t2.groupName) <= 8