From 100040be68a0dca20b3f7bca0889b00331214dfc Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 23 Nov 2020 15:30:55 +0800 Subject: [PATCH 1/4] 11-21-2 --- mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java | 2 ++ .../java/com/ccsens/mt/service/CompeteService.java | 13 +++++++++++++ .../java/com/ccsens/mt/service/ScoreService.java | 1 + 3 files changed, 16 insertions(+) diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java index 49f97b48..648516b6 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java @@ -227,6 +227,8 @@ public class ScoreVo { private String remark; @ApiModelProperty("名次") private int rangee; + @ApiModelProperty("视频路劲") + private String videoUrl; } @Data 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 a57c181b..4df80453 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -102,6 +102,8 @@ public class CompeteService implements ICompeteService { private CompetePlayerMapper competePlayerMapper; @Resource private CompeteJudgmentMapper competeJudgmentMapper; + @Resource + private CompeteVideoMapper competeVideoMapper; @Override @@ -1407,8 +1409,18 @@ public class CompeteService implements ICompeteService { @Override public List countScoreCurrentSite(CompeteDto.CompeteSite params) { + Long siteId = params.getSiteId(); List countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId); + countScoreCurrentSites.forEach(mes->{ + CompeteStartOrder competeStartOrder = competeStartOrderMapper.selectByPrimaryKey(siteId); + CompeteVideoExample competeVideoExample = new CompeteVideoExample(); + competeVideoExample.createCriteria().andProjectIdEqualTo(competeStartOrder.getProjectId()).andPlayerIdEqualTo(competeStartOrder.getPlayerId()); + List competeVideos = competeVideoMapper.selectByExample(competeVideoExample); + CompeteVideo competeVideo = competeVideos.get(0); + String path = competeVideo.getVideoUrl(); + mes.setVideoUrl(path); + }); return countScoreCurrentSites; } @@ -1816,6 +1828,7 @@ public class CompeteService implements ICompeteService { @Override public PageInfo queryCountScore(ScoreDto.ShowResult param) { + log.info("计数赛成绩公示：{}", param); CompeteProject project = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); log.info("查询{}项目的成绩：", project); diff --git a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java index 343c8220..615a5535 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java @@ -23,6 +23,7 @@ import com.ccsens.util.ExcelUtil; import com.ccsens.util.JsonResponse; import com.ccsens.util.WebConstant; import com.ccsens.util.exception.BaseException; +import com.sun.xml.internal.bind.v2.TODO; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; From 9814fcebc4a80df15045554c7ba81303e77f3938 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 23 Nov 2020 15:32:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 3 +++ .../com/ccsens/mt/service/CompeteService.java | 18 +++++++++---- .../resources/mapper_dao/CompeteVideoDao.xml | 25 +++++++++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 7408638b..64bcf444 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -525,6 +525,9 @@ public class CompeteVo { private Byte waiver; @ApiModelProperty("分数合集") private List scoreList; + @ApiModelProperty("分数合集") + private String videoPath; + } @Data @ApiModel 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 4b00b528..0b3d6fa6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -102,7 +102,8 @@ public class CompeteService implements ICompeteService { private CompetePlayerMapper competePlayerMapper; @Resource private CompeteJudgmentMapper competeJudgmentMapper; - + @Resource + private CompeteVideoMapper competeVideoMapper; @Override public PageInfo showResultPage(ScoreDto.ShowResultW param) { @@ -1175,11 +1176,11 @@ public class CompeteService implements ICompeteService { competeStartOrder.setRemark(param.getRemark()); competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); } + CompeteStartOrder competeStartOrder=new CompeteStartOrder(); + competeStartOrder.setId(param.getSiteOrderId()); + competeStartOrder.setWaiver(param.getWaiver()); + competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); if(param.getWaiver()!=((byte)0)){ - CompeteStartOrder competeStartOrder=new CompeteStartOrder(); - competeStartOrder.setId(param.getSiteOrderId()); - competeStartOrder.setWaiver(param.getWaiver()); - competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); for (int i = 0; i < param.getFractionsList().size(); i++) { param.getFractionsList().get(i).setScore(new BigDecimal(0)); } @@ -1792,6 +1793,13 @@ public class CompeteService implements ICompeteService { } */ + + CompeteVideoExample competeVideoExample=new CompeteVideoExample(); + competeVideoExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andPlayerIdEqualTo(competeStartOrder1.getPlayerId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()).andRecStatusEqualTo((byte)0); + List competeVideos = competeVideoMapper.selectByExample(competeVideoExample); + if(competeVideos.size()>0){ + selScropeVo.setVideoPath(competeVideos.get(0).getVideoUrl()); + } selScropeVo.setScoreList(scropLists); return selScropeVo; } diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index d2dbdde1..3d60b6d4 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -17,6 +17,21 @@ and t_compete_player_look.`look_time` <= #{param.signEndTime,jdbcType=TIMESTAMP} + group by company_id + + + + + + + + + + + + + + ) tcpl on tcpl.company_id=tcc.id where tct.id= #{param.id} @@ -46,6 +61,16 @@ and tall.t_sys_log.created_at <= #{param.signEndTime,jdbcType=TIMESTAMP} + GROUP BY tt.user_id + + + + + + + + + ) tt on tt.`user_id`=tcj.`user_id` LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id` WHERE From f9203196d5d1ca2bc005360a8ba37685c73142a0 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 23 Nov 2020 16:10:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8B=E6=A0=87=E8=B6=8A=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/mt/service/CompeteService.java | 8 +++++--- mt/src/main/java/com/ccsens/mt/service/ScoreService.java | 1 - tall/src/main/resources/application.yml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) 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 b1cfdcce..c5cc9943 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1417,9 +1417,11 @@ public class CompeteService implements ICompeteService { CompeteVideoExample competeVideoExample = new CompeteVideoExample(); competeVideoExample.createCriteria().andProjectIdEqualTo(competeStartOrder.getProjectId()).andPlayerIdEqualTo(competeStartOrder.getPlayerId()); List competeVideos = competeVideoMapper.selectByExample(competeVideoExample); - CompeteVideo competeVideo = competeVideos.get(0); - String path = competeVideo.getVideoUrl(); - mes.setVideoUrl(path); + if(competeVideos.size()>0) { + CompeteVideo competeVideo = competeVideos.get(0); + String path = competeVideo.getVideoUrl(); + mes.setVideoUrl(path); + } }); return countScoreCurrentSites; } diff --git a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java index 615a5535..343c8220 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ScoreService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ScoreService.java @@ -23,7 +23,6 @@ import com.ccsens.util.ExcelUtil; import com.ccsens.util.JsonResponse; import com.ccsens.util.WebConstant; import com.ccsens.util.exception.BaseException; -import com.sun.xml.internal.bind.v2.TODO; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common From c33258d2e65e64408bfb0250a80fc412cba82169 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 23 Nov 2020 16:36:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/resources/mapper_dao/CompeteVideoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 3d60b6d4..ca1fb630 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -61,7 +61,7 @@ and tall.t_sys_log.created_at <= #{param.signEndTime,jdbcType=TIMESTAMP} - GROUP BY tt.user_id + GROUP BY tall.t_sys_log.user_id