From 01edc0ada9fff032616f461f61f4688ab5072f79 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 19 Nov 2020 14:18:02 +0800 Subject: [PATCH 1/5] 11-19-1 --- .../ccsens/mt/api/CompeteScoreController.java | 9 +- .../com/ccsens/mt/bean/dto/CompeteDto.java | 11 ++ .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 25 ++++ .../java/com/ccsens/mt/bean/vo/TableVo.java | 11 +- .../mt/persist/dao/CompeteScoreDao.java | 3 + .../com/ccsens/mt/service/CompeteService.java | 110 ++++++++++++++++++ .../ccsens/mt/service/ICompeteService.java | 7 ++ mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectConfigDao.xml | 2 +- .../resources/mapper_dao/CompeteScoreDao.xml | 21 ++++ 10 files changed, 197 insertions(+), 6 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 6bff8f81..75f26ae1 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -98,5 +98,12 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(); } - + @MustLogin + @ApiOperation(value = "速度通级赛", notes = "") + @RequestMapping(value = "/speedPass", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse speedPass(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("速度通级赛：{}",params); + List speedPassList = competeService.speedPass(params.getParam()); + return JsonResponse.newInstance().ok(speedPassList); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index c1eb0f75..2fd4c9b4 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -368,5 +368,16 @@ public class CompeteDto { private BigDecimal finalScore; } + @Data + @ApiModel + public static class CompeteTimeAndProjectId{ + @NotNull + @ApiModelProperty("第几届信息的id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } + } 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 23b9a1dd..b57fd7db 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 @@ -517,4 +517,29 @@ public class CompeteVo { @ApiModelProperty("成绩") private Long grade; } + + @Data + @ApiModel("速度通级赛") + public static class SpeedPass{ + @ApiModelProperty("参赛队伍") + private String companyName; + @ApiModelProperty("组别") + private String groupName; + @ApiModelProperty("姓名") + private String playerName; + @ApiModelProperty("30秒单摇跳（次）") + private BigDecimal secondTime; + @ApiModelProperty("3分钟单摇跳（次）") + private BigDecimal minuteTime; + @ApiModelProperty("30秒单摇跳等级") + private int secondGrade; + @ApiModelProperty("3分钟单摇跳等级") + private int minuteGrade; + @ApiModelProperty("3分钟单摇跳等级") + private int grade; + @ApiModelProperty("玩家id") + private Long playerId; + @ApiModelProperty("项目id") + private Long projectId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 6b7698ff..0643eef7 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -166,10 +166,17 @@ public class TableVo { } public Long getStartTime(){ - return startTime == 0 ? null : startTime; + if (startTime != null) { + return startTime == 0 ? null : startTime; + } + return null; } public Long getEndTime(){ - return endTime == 0 ? null : endTime; + if (endTime != null) { + return endTime == 0 ? null : endTime; + } + return null; + } public int getTimeSum(){ if(duration != 0 && games != 0) { diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index 828dae59..7aa5162a 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -22,6 +22,9 @@ public interface CompeteScoreDao { List selectSingleVarity(@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId); List selectGroupVarity (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId); List selectCountScoreCurrentSite (@Param("siteId") long siteId); + List selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId); + + } 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 026b5502..4c1840fc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -23,6 +23,7 @@ import com.ccsens.util.*; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.BuiltinFormats; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Workbook; @@ -1250,4 +1251,113 @@ public class CompeteService implements ICompeteService { competeCountScoreMapper.insert(competeCountScore); } + @Override + public List speedPass(CompeteDto.CompeteTimeAndProjectId params) { + long projectId = params.getProjectId(); + long competeTimeId = params.getCompeteTimeId(); + List speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); + if (CollectionUtil.isNotEmpty(speedPassList)) { + for (CompeteVo.SpeedPass mes : speedPassList) { + //查30s单摇跳得分 + CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders.size() > 0) { + CompeteStartOrder competeStartOrder = competeStartOrders.get(0); + long id = competeStartOrder.getId(); + CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); + competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id); + List competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample); + CompeteCountScore competeCountScore = competeCountScoreList.get(0); + BigDecimal score = competeCountScore.getFinalScore(); + BigDecimal bigDecimal = new BigDecimal(2); + BigDecimal secondTimeScore = score.multiply(bigDecimal); + //查30s单摇跳得分 * 2 =次数 + mes.setSecondTime(secondTimeScore); + } + //3分钟单摇跳得分 + CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders1.size() > 0) { + CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0); + long id1 = competeStartOrder1.getId(); + CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample(); + competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1); + List competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1); + CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0); + BigDecimal score1 = competeCountScore1.getFinalScore(); + BigDecimal bigDecimal1 = new BigDecimal(2); + BigDecimal minuteTimeScore = score1.multiply(bigDecimal1); + //3分钟单摇跳得分 * 2 =次数 + mes.setMinuteTime(minuteTimeScore); + } + BigDecimal bigDecimal0 = new BigDecimal(70); + BigDecimal bigDecimal2 = new BigDecimal(90); + BigDecimal bigDecimal3 = new BigDecimal(105); + BigDecimal bigDecimal4 = new BigDecimal(120); + BigDecimal bigDecimal5 = new BigDecimal(130); + BigDecimal bigDecimal6 = new BigDecimal(140); + BigDecimal bigDecimal7 = new BigDecimal(300); + BigDecimal bigDecimal8 = new BigDecimal(380); + BigDecimal bigDecimal9 = new BigDecimal(460); + BigDecimal bigDecimal10 = new BigDecimal(540); + BigDecimal bigDecimal11 = new BigDecimal(620); + BigDecimal bigDecimal12 = new BigDecimal(700); + BigDecimal s =mes.getSecondTime(); + if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) { + //判断30s单摇跳等级 + if (mes.getSecondTime().compareTo(bigDecimal0) < 1) { + mes.setSecondGrade(1); + } + if (mes.getSecondTime().compareTo(bigDecimal2) < 1) { + mes.setSecondGrade(2); + } + if (mes.getSecondTime().compareTo(bigDecimal3) < 1) { + mes.setSecondGrade(3); + } + if (mes.getSecondTime().compareTo(bigDecimal4) < 1) { + mes.setSecondGrade(4); + } + if (mes.getSecondTime().compareTo(bigDecimal5) < 1) { + mes.setSecondGrade(5); + } + if (mes.getSecondTime().compareTo(bigDecimal6) < 1) { + mes.setSecondGrade(6); + } + //判断3分钟单摇跳等级 + if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) { + mes.setMinuteGrade(1); + } + if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) { + mes.setMinuteGrade(2); + } + + if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) { + mes.setMinuteGrade(3); + } + + if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) { + mes.setMinuteGrade(4); + } + + if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) { + mes.setMinuteGrade(5); + } + + if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) { + mes.setMinuteGrade(6); + } + //如果30s得等级小于等于3分钟得等级 + if (mes.getSecondGrade() <= mes.getMinuteGrade()) { + mes.setGrade(mes.getSecondGrade()); + } else { + mes.setGrade(mes.getMinuteGrade()); + } + } + } + } + return speedPassList; + } + } \ No newline at end of file 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 bdc7be69..4459ec9f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -187,6 +187,13 @@ public interface ICompeteService { void submitScore(CompeteDto.SubmitScore params) ; + /** + * 速度通级赛 + * @param params 项目id和场次id + * @return 返回项目，开始时间和比赛状态 + */ + List speedPass(CompeteDto.CompeteTimeAndProjectId params); + } 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/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 86c4dd88..0037e856 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -66,7 +66,7 @@ LEFT JOIN ( SELECT id, - if(FROM_UNIXTIME(start_time/1000,'%h') <= 5,1 ,0) as aa + if(FROM_UNIXTIME(start_time/1000,'%h') <= 12,1 ,0) as aa FROM t_compete_project_config )a on c.id = a.id diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 43ea9e8f..5b703f6e 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -105,5 +105,26 @@ and tcso.id =#{siteId} + + \ No newline at end of file From 6707874cdf1565f28dea50c4c73f7a126b412552 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 19 Nov 2020 14:33:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E8=A1=A8=E7=BC=BA=E5=B0=91=E7=BB=84=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a810070f..47b8a266 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -371,7 +371,7 @@ public class ExcelService implements IExcelService { //查询组别，并赋值 CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); if (ObjectUtil.isNotNull(competeGroup)) { - competeJoin.setCompeteGroup(competePlayer.getName()); + competeJoin.setCompeteGroup(competeGroup.getGroupName()); } // //身份证明查询，并赋值 // CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); From c8568cf2bba89f82c9b6dee4521a9e0cdeeccd15 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 19 Nov 2020 14:56:28 +0800 Subject: [PATCH 3/5] 11-19-2 --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a810070f..47b8a266 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -371,7 +371,7 @@ public class ExcelService implements IExcelService { //查询组别，并赋值 CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); if (ObjectUtil.isNotNull(competeGroup)) { - competeJoin.setCompeteGroup(competePlayer.getName()); + competeJoin.setCompeteGroup(competeGroup.getGroupName()); } // //身份证明查询，并赋值 // CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); From 1c4efab75620520005762c114a0aa95c40e48933 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 19 Nov 2020 15:17:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A7=93=E5=90=8D=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/ExcelService.java | 1 + 1 file changed, 1 insertion(+) 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 47b8a266..b01ab21a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -582,6 +582,7 @@ public class ExcelService implements IExcelService { int coach = 0; CompeteCoachExample competeCoachExample = new CompeteCoachExample(); competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach); + List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); long count = competeCoachMapper.countByExample(competeCoachExample); //每个公司的领队数量 CompeteCoachExample competeCoachExample1 = new CompeteCoachExample(); From 29b1de74fe2b885909063c52ebd022417010efb8 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 19 Nov 2020 17:58:59 +0800 Subject: [PATCH 5/5] 11-19-2 --- mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java | 2 ++ mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 1 - mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) 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 c2ce6cbe..cb516aa6 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 @@ -225,6 +225,8 @@ public class ScoreVo { private BigDecimal finalScore; @ApiModelProperty("备注") private String remark; + @ApiModelProperty("名词") + private int rangee; } } 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 b01ab21a..5a7e1ff7 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -266,7 +266,6 @@ public class ExcelService implements IExcelService { jiaolianHang.setValue(String.valueOf(jiaolianName)); jiaolianList.add(jiaolianHang); biao.add(jiaolianList); - //再放运动员 StringBuffer yDYLN=new StringBuffer(""); competePlayerList.forEach(cpL->{ diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 3e762612..02bfbd9c 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -105,6 +105,7 @@ and tcso.id =#{siteId}