From bbe2972c0572e0f87f0e8fd8dea6980eaab8f922 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 23 Nov 2020 17:14:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/service/CompeteVedioService.java | 10 ++++++++-- mt/src/main/resources/application.yml | 4 ++-- mt/src/main/resources/mapper_dao/CompeteVideoDao.xml | 9 --------- tall/src/main/resources/application.yml | 4 ++-- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 9e9c31f4..1252b8c2 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -68,16 +68,22 @@ public class CompeteVedioService implements ICompeteVedioService{ @Override public String uploadVideoPath(VideoDto.UploadVdeo param) { + CompeteVideoExample competeVideoExample=new CompeteVideoExample(); + competeVideoExample.createCriteria().andProjectIdEqualTo(param.getCompeteProjectId()).andPlayerIdEqualTo(param.getPlayerOrTeamId()).andRecStatusEqualTo((byte)0); + List competeVideos = competeVideoMapper.selectByExample(competeVideoExample); + if(competeVideos.size()>0){ + return competeVideos.get(0).getVideoUrl(); + } CompeteVideo competeVideo=new CompeteVideo(); competeVideo.setId(snowflake.nextId()); competeVideo.setCompeteTimeId(param.getCompeteTimeId()); - competeVideo.setProjectId(param.getCompeteProjectId()); + //competeVideo.setProjectId(param.getCompeteProjectId()); competeVideo.setPlayerId(param.getPlayerOrTeamId()); competeVideo.setVideoUrl(param.getVideoPath()); competeVideo.setRecStatus((byte) 0); long startTime = System.currentTimeMillis(); competeVideo.setUploadTime(startTime); - competeVideoMapper.insert(competeVideo); + competeVideoMapper.insertSelective(competeVideo); return param.getVideoPath(); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index ca1fb630..a7623fbb 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -62,15 +62,6 @@ and tall.t_sys_log.created_at <= #{param.signEndTime,jdbcType=TIMESTAMP} GROUP BY tall.t_sys_log.user_id - - - - - - - - - ) tt on tt.`user_id`=tcj.`user_id` LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id` WHERE diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common From c5de8c0f9378becb8030da1ea9679f3d644e40ab Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 23 Nov 2020 17:49:32 +0800 Subject: [PATCH 2/4] 20201123v1.4 --- .../main/java/com/ccsens/mt/api/KCPlayerController.java | 2 +- .../main/java/com/ccsens/mt/service/KCPlayerService.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java index 068e7bc2..cd19b869 100644 --- a/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java +++ b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java @@ -41,7 +41,7 @@ public class KCPlayerController { @ApiOperation(value = "云点播回调接口", notes = "上传时候后，云点播回调接口，保存视频的路径") @RequestMapping(value = "/receive", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse receive(@RequestBody JSONObject jsonObject) { - log.info("接受文件上传通知：{}",jsonObject); + log.info("云点播回调接口：{}",jsonObject); kcPlayerService.saveVideoUrl(jsonObject); return JsonResponse.newInstance().ok(); } diff --git a/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java index ae222ba6..cafebab8 100644 --- a/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java +++ b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java @@ -73,9 +73,11 @@ public class KCPlayerService implements IKCPlayerService{ JSONObject sourceInfo = mediaBasicInfo.getJSONObject("SourceInfo"); JSONObject sourceContext = sourceInfo.getJSONObject("SourceContext"); Long orderId = Long.parseLong(sourceContext.toString()); + log.info("获取场次id：{}",orderId); // TODO 获取视频路径 JSONObject mediaUrl = mediaBasicInfo.getJSONObject("MediaUrl"); String videoUrl = mediaUrl.toString(); + log.info("获取视频路径：{}",videoUrl); //通过场次id获取场次信息 CompeteStartOrder startOrder = startOrderMapper.selectByPrimaryKey(orderId); if(ObjectUtil.isNull(startOrder)){ @@ -85,9 +87,12 @@ public class KCPlayerService implements IKCPlayerService{ CompeteVideoExample competeVideoExample = new CompeteVideoExample(); competeVideoExample.createCriteria().andProjectIdEqualTo(startOrder.getProjectId()) .andPlayerIdEqualTo(startOrder.getPlayerId()); - if(competeVideoMapper.countByExample(competeVideoExample) > 0){ + long count = competeVideoMapper.countByExample(competeVideoExample); + log.info("查询以前上传的视频的记录：{}",count); + if(count > 0){ throw new BaseException(CodeEnum.ALREADY_UPLOAD_VIDEO); } + //将视频信息存入视频表 CompeteVideo competeVideo = new CompeteVideo(); competeVideo.setId(snowflake.nextId()); @@ -95,6 +100,7 @@ public class KCPlayerService implements IKCPlayerService{ competeVideo.setPlayerId(startOrder.getPlayerId()); competeVideo.setVideoUrl(videoUrl); competeVideo.setUploadTime(System.currentTimeMillis()); + log.info("添加上传视频记录：{}",count); competeVideoMapper.insertSelective(competeVideo); } } From 5cbb4b636a4cabc908cb1eb87d9898f0498a3e38 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 23 Nov 2020 17:50:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 6 +++--- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- mt/src/main/java/com/ccsens/mt/service/ICompeteService.java | 2 +- 3 files changed, 5 insertions(+), 5 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 c5b41708..205e2909 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -107,8 +107,8 @@ public class CompeteService implements ICompeteService { @Override - public PageInfo showResultPage(ScoreDto.ShowResultW param) { - PageHelper.startPage(param.getPageNum(),param.getPageSize()); + public List showResultPage(ScoreDto.ShowResultW param) { + //PageHelper.startPage(param.getPageNum(),param.getPageSize()); List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); @@ -207,7 +207,7 @@ public class CompeteService implements ICompeteService { totalScoreDisplay.setRownum(i+1); } - return new PageInfo<>(totalScoreDisplaysList); + return totalScoreDisplaysList; } /** * 花样赛总成绩展示 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 d84164b2..68f17e7a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1332,7 +1332,7 @@ public class ExcelService implements IExcelService { @Override public String patternExpTable(ScoreDto.ShowResultW param) { - List totalScoreDisplays = competeService.showResult(param).getList(); + List totalScoreDisplays = competeService.showResultPage(param); List> list = new ArrayList<>(); List zero=new ArrayList<>(); PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1); diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 56ab4697..758e42df 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -155,7 +155,7 @@ public interface ICompeteService { void submitOrderList(ScoreDto.InformationSubmitted param); - PageInfo showResultPage(ScoreDto.ShowResultW param); + List showResultPage(ScoreDto.ShowResultW param); PageInfo showResult(ScoreDto.ShowResultW param); From d9f07452c7298c29f0078c9183949b35d47dd1d8 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 23 Nov 2020 19:30:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8A=B1=E6=A0=B7=E8=B5=9B=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=B5=9B=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/service/CompeteVedioService.java | 2 +- .../com/ccsens/mt/service/ExcelService.java | 51 +++++++++++++------ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 1252b8c2..7ac80102 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -77,7 +77,7 @@ public class CompeteVedioService implements ICompeteVedioService{ CompeteVideo competeVideo=new CompeteVideo(); competeVideo.setId(snowflake.nextId()); competeVideo.setCompeteTimeId(param.getCompeteTimeId()); - //competeVideo.setProjectId(param.getCompeteProjectId()); + competeVideo.setProjectId(param.getCompeteProjectId()); competeVideo.setPlayerId(param.getPlayerOrTeamId()); competeVideo.setVideoUrl(param.getVideoPath()); competeVideo.setRecStatus((byte) 0); 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 68f17e7a..daf0577c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -14,11 +14,13 @@ import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; import com.ccsens.mt.util.Constant; +import com.ccsens.util.CodeEnum; import com.ccsens.util.PoiUtil; import com.ccsens.util.PropUtil; import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.util.exception.BaseException; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -1332,17 +1334,18 @@ public class ExcelService implements IExcelService { @Override public String patternExpTable(ScoreDto.ShowResultW param) { - List totalScoreDisplays = competeService.showResultPage(param); + //List totalScoreDisplays = competeService.showResultPage(param); + List totalScoreDisplays = competeScoreDao.queryVarietyScore(param.getProjectId()); List> list = new ArrayList<>(); List zero=new ArrayList<>(); PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1); zero.add(zeroOne); list.add(zero); List one=new ArrayList<>(); - PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1); - PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1); + PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 2); PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1); - PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1); + PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 2); PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1); PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 2); PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 2); @@ -1352,8 +1355,13 @@ public class ExcelService implements IExcelService { one.add(oneOne); one.add(oneTwo); one.add(oneThree); + one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) ); + one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) ); one.add(oneFour); + one.add(oneFive); + one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) ); + one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) ); one.add(oneSix); one.add(oneSeven); one.add(oneEight); @@ -1361,8 +1369,8 @@ public class ExcelService implements IExcelService { one.add(oneTen); list.add(one); List two = new ArrayList<>(); - PoiUtil.PoiUtilCell twoOne = new PoiUtil.PoiUtilCell(); - PoiUtil.PoiUtilCell twoTwo = new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoOne = new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL); + PoiUtil.PoiUtilCell twoTwo = new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL); 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); @@ -1386,7 +1394,7 @@ public class ExcelService implements IExcelService { PoiUtil.PoiUtilCell threeTwo = new PoiUtil.PoiUtilCell(mes.getPeopleName(), 1, 1); three.add(threeOne); three.add(threeTwo); - if(mes.getRemark()==(byte)0){ + if(true){ PoiUtil.PoiUtilCell threeThree=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee1()),1,1); PoiUtil.PoiUtilCell threeFive=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee2()),1,1); PoiUtil.PoiUtilCell threeSix=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee3()),1,1); @@ -1491,16 +1499,23 @@ public class ExcelService implements IExcelService { public String countExpTable(ScoreDto.ShowResult param) { - List countScoreCurrentSiteList = new ArrayList<>(); - CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); - if(ObjectUtil.isNotNull(competeProject)) { - if(competeProject.getTeam() == 0) { - countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId()); - }else { - countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId()); - } + log.info("计数赛成绩公示：{}", param); + CompeteProject project = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + log.info("查询{}项目的成绩：", project); + if (project == null) { + throw new BaseException(CodeEnum.PARAM_ERROR); } - List countScoreCurrentSites = countScoreCurrentSiteList; + + // PageHelper.startPage(param.getPage(), param.getSize()); + List countScoreCurrentSiteList; + if (project.getTeam() == Constant.Compete.TEAM_YES) { + // 团体赛 + countScoreCurrentSiteList = competeScoreDao.queryCountScoreTeam(param.getProjectId()); + } else { + // 个人赛 + countScoreCurrentSiteList = competeScoreDao.queryCountScorePerson(param.getProjectId()); + } + List countScoreCurrentSites = countScoreCurrentSiteList; List> list = new ArrayList<>(); @@ -1519,9 +1534,13 @@ public class ExcelService implements IExcelService { PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("名词", 1, 2); PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("备注", 1, 2); one.add(oneOne); + one.add(oneTwo); + one.add(oneThree); + one.add(oneFour); + one.add(new PoiUtil.PoiUtilCell()); one.add(oneFive); one.add(oneSix); one.add(oneSeven);