From b5503616787c75864261d0f8c1c21d6ca12493ec Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 16 Nov 2020 10:01:37 +0800 Subject: [PATCH 1/5] 11-16-1 --- .../java/com/ccsens/mt/api/CompeteScoreController.java | 8 ++++---- mt/src/main/resources/application.yml | 4 ++-- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 2 +- 3 files changed, 7 insertions(+), 7 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 f5715c4b..983dd98f 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -41,7 +41,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "项目状态", notes = "") + @ApiOperation(value = "项目状态", notes = "lihong，查询项目集合，再根据时间判断项目得状态") @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); @@ -50,7 +50,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "选手排名", notes = "") + @ApiOperation(value = "选手排名", notes = "多个信息表关联之后，利用分数排序") @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScoreDetail(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); @@ -60,7 +60,7 @@ public class CompeteScoreController { @MustLogin - @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "") + @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "多表关联之后，查询当前你场次得分数信息") @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScoreCurrentSite(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); @@ -69,7 +69,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "技术赛提交分数", notes = "") + @ApiOperation(value = "技术赛提交分数", notes = "接受前端得请求参数，插入相关得表中") @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",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/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index a03505c0..1a789b7b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -42,7 +42,6 @@ tcp.`name` as name, tcc.`name` as companyName, tcvs.score as score - from t_compete_project_player tcpp LEFT JOIN t_compete_player tcp ON tcpp.player_id = tcp.id LEFT JOIN t_compete_start_order tcso on tcso.player_id = tcpp.player_id @@ -57,6 +56,7 @@ and tcpp.compete_group_id = #{competeGroupId} GROUP BY tcvs.score + diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee29058b..ee0a41b5 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7070 + port: 7030 servlet: context-path: /v1.0 spring: 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 8e2b8298e0565aea8d8b07b2d734fa22bd0bda36 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 16 Nov 2020 14:41:36 +0800 Subject: [PATCH 3/5] 20201116v1.1 --- .../ccsens/mt/api/CompeteTaskController.java | 27 ++++++++---- .../ccsens/mt/api/CompeteVideoController.java | 32 +++++++------- .../com/ccsens/mt/bean/dto/CompeteDto.java | 2 +- .../mt/bean/dto/ProvinceCompeteDto.java | 35 ++++++++++++++++ .../java/com/ccsens/mt/bean/dto/VideoDto.java | 18 ++++++-- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 42 ++++++++++--------- .../persist/dao/CompeteProjectConfigDao.java | 2 +- .../mt/persist/dao/CompeteVideoDao.java | 4 +- .../ccsens/mt/service/CompeteTaskService.java | 13 +++++- .../mt/service/CompeteVedioService.java | 4 +- .../mt/service/ICompeteTaskService.java | 9 +++- .../mt/service/ICompeteVedioService.java | 4 +- .../resources/mapper_dao/CompetePlayerDao.xml | 8 ++-- .../mapper_dao/CompeteProjectConfigDao.xml | 39 +++++++++++++---- .../resources/mapper_dao/CompeteVideoDao.xml | 4 +- tall/src/main/resources/application-dev.yml | 2 +- tall/src/main/resources/application.yml | 4 +- 17 files changed, 172 insertions(+), 77 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 20bbd7bc..91b0b444 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -36,9 +36,9 @@ public class CompeteTaskController { @ApiOperation(value = "查找日期配置", notes = "zy:查找项目对应的配置信息") @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryCompeteConfig(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("日程安排更新：{}",params); + log.info("查找日期配置：{}",params); List dailyScheduleProcessList = competeTaskService.queryCompeteConfig(params.getParam()); - log.info("日程安排更新：{}",dailyScheduleProcessList); + log.info("查找日期配置：{}",dailyScheduleProcessList); return JsonResponse.newInstance().ok(dailyScheduleProcessList); } @@ -56,10 +56,11 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "查看该学校选手列表，按出场顺序(手机上上传视频用)", notes = "zy:按顺序查找出场顺序表，筛选出该学校在此项目中的所有选手或团队的出场顺序和时间") @RequestMapping(value = "/query/players", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryStartOrderByCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("日程安排更新：{}",params); - List startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam()); - log.info("日程安排更新：{}",startOrderByCompanyList); + public JsonResponse> queryStartOrderByCompany( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看该学校选手列表：{}",params); + List startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam()); + log.info("查看该学校选手列表：{}",startOrderByCompanyList); return JsonResponse.newInstance().ok(startOrderByCompanyList); } @@ -67,9 +68,19 @@ public class CompeteTaskController { @ApiOperation(value = "查看裁判分配信息", notes = "zy:查看每个项目下的每个场地的裁判信息") @RequestMapping(value = "/query/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryJudgment(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("日程安排更新：{}",params); + log.info("查看裁判分配信息：{}",params); List queryJudgmentList = competeTaskService.queryJudgment(params.getParam()); - log.info("日程安排更新：{}",queryJudgmentList); + log.info("查看裁判分配信息：{}",queryJudgmentList); + return JsonResponse.newInstance().ok(queryJudgmentList); + } + + @MustLogin + @ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表，根据内容给每个的项目的每个场次添加裁判信息") + @RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> allocationJudgment(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("分配裁判信息：{}",params); + List queryJudgmentList = competeTaskService.allocationJudgment(params.getParam()); + log.info("分配裁判信息：{}",queryJudgmentList); return JsonResponse.newInstance().ok(queryJudgmentList); } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index 9b765c08..ab32b664 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -33,16 +33,16 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "添加用户观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，") @RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); iCompeteVedioService.insertSignVideo(params.getParam().getCompanyId()); return JsonResponse.newInstance().ok(); } @MustLogin @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false") @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); return JsonResponse.newInstance().ok(code); } @@ -51,28 +51,24 @@ public class CompeteVideoController { @ApiOperation(value = "上传视频保存上传记录 (比赛视频)", notes = "Mr.王---------增加一条数据到competevideo") @RequestMapping(value = "/insertVideoRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse uploadVideo(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); String path= iCompeteVedioService.uploadVideoPath(params.getParam()); return JsonResponse.newInstance().ok(path); } @MustLogin - @ApiOperation(value = "查看单位签到状态（签到用）（有筛选", notes = "Mr.王---------查看单位的人的最近一条的签到状态") + @ApiOperation(value = "查看单位签到状态（签到用）（有筛选)", notes = "Mr.王---------查看单位的人的最近一条的签到状态") @RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - - - log.info("查看单位签到状态（签到用）",params); + public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看单位签到状态（签到用）:{}",params); List peoSignStatus = iCompeteVedioService.selectCompanySignStatus(params); return JsonResponse.newInstance().ok(peoSignStatus); } @MustLogin - @ApiOperation(value = "查看教练签到状态（签到用）（有筛选", notes = "Mr.王---------查看教练的人的签到状态") + @ApiOperation(value = "查看教练签到状态（签到用）", notes = "Mr.王---------查看教练的人的签到状态") @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - - - log.info("查看教练签到状态（签到用）",params); + public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看教练签到状态（签到用）:{}",params); List coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); return JsonResponse.newInstance().ok(coachSignStatus); } @@ -82,7 +78,7 @@ public class CompeteVideoController { @RequestMapping(value = "/selectTwoProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); List list=iCompeteVedioService.selectTwoProject(params); return JsonResponse.newInstance().ok(list); @@ -90,8 +86,8 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查") @RequestMapping(value = "/selectAllCompany", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + public JsonResponse> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); List list=iCompeteVedioService.selectAllCompany(params); return JsonResponse.newInstance().ok(list); } 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 74adc31b..c1eb0f75 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 @@ -335,7 +335,7 @@ public class CompeteDto { } @Data - @ApiModel("项目id和组别id") + @ApiModel("查看选手列表（手机用）") public static class ProjectIdAndGroupId{ @ApiModelProperty("项目id") private Long projectId; diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index 82ba72da..16e8ba05 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -239,4 +239,39 @@ public class ProvinceCompeteDto { private Long companyId; } + + @Data + @ApiModel("分配裁判信息") + public static class AllocationJudgment{ + @NotNull + @ApiModelProperty("比赛项目id") + private Long projectId; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("不同场地的裁判") + private List siteJudgmentList; + } + @Data + @ApiModel("场地上的裁判信息") + public static class SiteJudgment{ + @ApiModelProperty("场地信息（场地序号）") + private int site; + @ApiModelProperty("裁判基本信息") + private List judgmentInfoList; + } + @Data + @ApiModel("裁判的角色基本信息") + public static class JudgmentInfo{ + @ApiModelProperty("第几号裁判 0主裁判 1一号裁判 2二号裁判 。。。。。") + private int judgmentNum; + @ApiModelProperty("姓名") + private String judgmentName; + @ApiModelProperty("手机号") + private String judgmentPhone; + @ApiModelProperty("备注") + private String remark; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 21bb3fd9..5dc4780e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -42,7 +42,7 @@ public class VideoDto { } @Data @ApiModel("添加用户观看开幕式视频记录（签到用）") - public static class Vdeo{ + public static class Video{ @NonNull @ApiModelProperty("视频文件id") private Long companyId; @@ -76,18 +76,28 @@ public class VideoDto { } @Data @ApiModel("参赛队伍/裁判签到表") - public static class GetTeamSignStatu{ + public static class GetTeamSignStatus{ @ApiModelProperty("大赛id") private Long id; @ApiModelProperty("姓名/参赛队伍") private String name; - @ApiModelProperty("账号") private String phone; - @ApiModelProperty("签到时间") private Long signEndTime; + } + @Data + @ApiModel("查看教练签到信息") + public static class GetSignStatus{ + @ApiModelProperty("大赛id") + private Long id; + @ApiModelProperty("姓名/参赛队伍") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("签到时间") + private Long signEndTime; } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 6f1a9738..d999e62e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -234,41 +234,45 @@ public class ProvinceCompeteVo { } @Data - @ApiModel("查看单位下当前项目所有参赛人员或队伍信息") - public static class StartOrderByCompany { + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息（上传视频用）") + public static class StartOrderByCompanyAndProject { @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("项目名") private String projectName; - @ApiModelProperty("场次id") - private Long startOrderId; - @ApiModelProperty("场次") - private int competeOrder; - @ApiModelProperty("场地") - private int site; - @ApiModelProperty("选手名") - private String playerName; - @ApiModelProperty("组别名") - private String groupName; + @ApiModelProperty("项目下的每个场次的选手") + private List startOrderList; @ApiModelProperty("开始时间") private Long startTime; @ApiModelProperty("结束时间") private Long endTime; - public Long getStartTime(){ + public Long getEndTime(){ if(ObjectUtil.isNotNull(startTime) && startTime != 0){ return startTime + Constant.UPLOAD_VIDEO_TIME; } return null; } - public Long getEndTime(){ - if(ObjectUtil.isNotNull(endTime) && endTime != 0){ - return endTime + Constant.UPLOAD_VIDEO_TIME; - } - return null; - } + } + @Data + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息（上传视频用）") + public static class StartOrder { + @ApiModelProperty("场次id") + private Long startOrderId; + @ApiModelProperty("场次") + private int competeOrder; + @ApiModelProperty("场地") + private int site; + @ApiModelProperty("选手名") + private List playerNameList; + @ApiModelProperty("是否是团队项目 0否 1是") + private int team; + @ApiModelProperty("组别名") + private String groupName; + @ApiModelProperty("视频连接（云点播）（为null则代表未传视频）") + private Long videoUrl; } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java index 39a3bb49..795bf50e 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -35,5 +35,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { * @param projectId 项目di * @return 返回选手列表 */ - List queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId); + List queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java index f014c8c0..67293e9e 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java @@ -12,7 +12,7 @@ import java.util.List; */ public interface CompeteVideoDao extends CompeteCompanyMapper { - List selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + List selectCompanySignStatus(@Param("param") VideoDto.GetSignStatus param); - List selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + List selectCoachSignStatus(@Param("param") VideoDto.GetSignStatus param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index a59ef5c4..1f7d4f66 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -110,7 +110,7 @@ public class CompeteTaskService implements ICompeteTaskService{ return projectConfigDao.queryProjectConfig(type.get()); } /** - * 修改配置时生成出场顺序(先删除之前的数据) + * 修改配置时生成出场顺序 */ public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId) { if (ObjectUtil.isNotNull(projectConfig)) { @@ -272,7 +272,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 手机上查看选手出场顺序 */ @Override - public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { + public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(),param.getProjectId(),param.getCompeteTimeId()); } @@ -283,4 +283,13 @@ public class CompeteTaskService implements ICompeteTaskService{ public List queryJudgment(CompeteDto.CompeteTime param) { return competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); } + + /** + * 分配裁判 + */ + @Override + public List allocationJudgment(ProvinceCompeteDto.AllocationJudgment param) { + + return null; + } } 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 0f3a36fa..16bdebe9 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -107,7 +107,7 @@ public class CompeteVedioService implements ICompeteVedioService{ * @return */ @Override - public List selectCompanySignStatus(QueryDto params) { + public List selectCompanySignStatus(QueryDto params) { return competeVideoDao.selectCompanySignStatus(params.getParam()); } /** @@ -116,7 +116,7 @@ public class CompeteVedioService implements ICompeteVedioService{ * @return */ @Override - public List selectCoachSignStatus(QueryDto params) { + public List selectCoachSignStatus(QueryDto params) { log.info(params.getParam().toString()); return competeVideoDao.selectCoachSignStatus(params.getParam()); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index 4f604088..a6cfebcb 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -30,7 +30,7 @@ public interface ICompeteTaskService { * @param param * @return */ - List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param); + List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param); /** * 查看所有项目下的裁判分配信息 @@ -38,4 +38,11 @@ public interface ICompeteTaskService { * @return */ List queryJudgment(CompeteDto.CompeteTime param); + + /** + * 为项目分配裁判 + * @param param + * @return + */ + List allocationJudgment(ProvinceCompeteDto.AllocationJudgment param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java index 96a011e9..44028a80 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -28,7 +28,7 @@ public interface ICompeteVedioService { List selectAllCompany(QueryDto params); - List selectCompanySignStatus(QueryDto params); + List selectCompanySignStatus(QueryDto params); - List selectCoachSignStatus(QueryDto params); + List selectCoachSignStatus(QueryDto params); } diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 49ae599c..fc82a267 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 5edd2613..3477069a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -12,6 +12,24 @@ + + + + + + + + + + + + + + + + + + - SELECT so.id as startOrderId, so.compete_order as competeOrder, so.site as site, - so.start_time as startTime, - so.end_time as endTime, + pc.start_time as startTime, pr.id as projectId, pr.`name` as projectName, + pr.`team` as team, if(pr.team = 0,a.plName,b.plName) as playerName, - if(pr.team = 0,a.groupName,b.groupName) as groupName + if(pr.team = 0,a.groupName,b.groupName) as groupName, + if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl from t_compete_start_order so LEFT JOIN t_compete_project pr on so.project_id = pr.id LEFT JOIN t_compete_time ti on pr.type = ti.type + LEFT JOIN t_compete_project_config pc on pc.project_id = pr.id LEFT JOIN ( SELECT pp.id as ppId, pl.`name` as plName, - g.group_name as groupName + g.group_name as groupName, + v.video_url as videoUrl FROM t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id LEFT JOIN t_compete_group g on g.id = pl.compete_group_id + LEFT JOIN t_compete_video v on pp.id = v.player_id WHERE pl.company_id = #{companyId} and pp.rec_status = 0 @@ -199,18 +221,19 @@ ( SELECT t.id as teamId, - GROUP_CONCAT(pl.`name` separator '、') as plName, - g.group_name as groupName + pl.`name` as plName, + g.group_name as groupName, + v.video_url as videoUrl FROM t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id LEFT JOIN t_compete_player pl on m.player_id = pl.id LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex + LEFT JOIN t_compete_video v on t.id = v.player_id WHERE t.company_id = #{companyId} and t.rec_status = 0 and m.rec_status = 0 and pl.rec_status = 0 - GROUP BY t.id )b on b.teamId = so.player_id WHERE diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 6bbbcbc4..88fcaf07 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -2,7 +2,7 @@ - select tcc.name as name, tcc.`contacts_phone` as phone, @@ -29,7 +29,7 @@ and tcc.`rec_status`=0 and tct.`rec_status`=0 - select tcj.`name` as `name`, tcj.`phone` as `phone`, diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee29058b..ee0a41b5 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7070 + port: 7030 servlet: context-path: /v1.0 spring: 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 45630478d2dca47ac8365344db141c8f704ecd54 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 16 Nov 2020 15:02:10 +0800 Subject: [PATCH 4/5] 20201116v1.2 --- .../com/ccsens/mt/service/CompeteService.java | 22 ++++++++++++------- mt/src/main/resources/application.yml | 4 ++-- .../mapper_dao/CompeteProjectConfigDao.xml | 3 ++- 3 files changed, 18 insertions(+), 11 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 aad60092..21ead7c0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -84,11 +84,15 @@ public class CompeteService implements ICompeteService { @Resource private TallFeignClient tallFeignClient; @Resource - private CommonFileMapper commonFileMapper; - @Resource private CompeteStartOrderMapper competeStartOrderMapper; @Resource private CompeteVarietyScoreMapper competeVarietyScoreMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteScoreDao competeScoreDao; + @Resource + private CompeteCountScoreMapper competeCountScoreMapper; /** * 花样赛总成绩展示 @@ -183,11 +187,6 @@ public class CompeteService implements ICompeteService { return null; } - private CompeteProjectConfigDao competeProjectConfigDao; - @Resource - private CompeteScoreDao competeScoreDao; - @Resource - private CompeteCountScoreMapper competeCountScoreMapper; /** * 查看第几届 @@ -1143,7 +1142,14 @@ public class CompeteService implements ICompeteService { List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); for(CompeteProject competeProject : competeProjectList) { long projectId = competeProject.getId(); - CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId); +// CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId); + CompeteProjectConfig competeProjectConfig = null; + CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample(); + projectConfigExample.createCriteria().andProjectIdEqualTo(projectId); + List projectConfigList = competeProjectConfigDao.selectByExample(projectConfigExample); + if(CollectionUtil.isNotEmpty(projectConfigList)){ + competeProjectConfig = projectConfigList.get(0); + } if (ObjectUtil.isNotNull(competeProjectConfig)) { CompeteVo.CountScore countScore = new CompeteVo.CountScore(); countScore.setId(competeProject.getId()); 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 d7147743..2591e528 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -43,7 +43,8 @@ where a.project_id = b.id From edca449b5fe9805b0465651c89a5adde1fc07e2e Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 16 Nov 2020 17:39:47 +0800 Subject: [PATCH 5/5] 11-13-3 --- .../ccsens/mt/api/CompeteScoreController.java | 2 +- .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 2 +- .../com/ccsens/mt/service/CompeteService.java | 16 +++++++++------- mt/src/main/resources/application.yml | 4 ++-- 4 files changed, 13 insertions(+), 11 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 99fa955a..6bff8f81 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -52,7 +52,7 @@ public class CompeteScoreController { competeService.submitOrderList(params.getParam()); return JsonResponse.newInstance().ok(); } - @MustLogin + @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩") @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ 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 a84b0426..23b9a1dd 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 @@ -503,7 +503,7 @@ public class CompeteVo { private String projectName; @ApiModelProperty("项目开始时间") private Long startTime; - @ApiModelProperty("项目状态") + @ApiModelProperty("项目状态0-未开始,1-进行中,2-结束") private int status; } 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 aad60092..c31526e6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -89,6 +89,12 @@ public class CompeteService implements ICompeteService { private CompeteStartOrderMapper competeStartOrderMapper; @Resource private CompeteVarietyScoreMapper competeVarietyScoreMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteScoreDao competeScoreDao; + @Resource + private CompeteCountScoreMapper competeCountScoreMapper; /** * 花样赛总成绩展示 @@ -183,11 +189,7 @@ public class CompeteService implements ICompeteService { return null; } - private CompeteProjectConfigDao competeProjectConfigDao; - @Resource - private CompeteScoreDao competeScoreDao; - @Resource - private CompeteCountScoreMapper competeCountScoreMapper; + /** * 查看第几届 @@ -1155,12 +1157,12 @@ public class CompeteService implements ICompeteService { //未开始0-未开始 countScore.setStatus(0); } - if (currentTime > competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() > currentTime) { + if (currentTime >= competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() >= currentTime) { //进行中1-进行中 countScore.setStatus(1); } if (competeProjectConfig.getEndTime() < currentTime) { - //已经结束-结束 + //已经结束2-结束 countScore.setStatus(2); } countScoreList.add(countScore); 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