From dff9745f345dbb449fe81026b8ea62e0330993c2 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 15:29:06 +0800 Subject: [PATCH 1/4] 1 --- .../ccsens/mt/api/CompeteScoreController.java | 17 +++++ .../com/ccsens/mt/bean/dto/CompeteDto.java | 9 +++ .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 26 +++++++ .../persist/dao/CompeteProjectConfigDao.java | 1 + .../com/ccsens/mt/service/CompeteService.java | 73 +++++++++++++++++-- .../ccsens/mt/service/ICompeteService.java | 16 ++++ mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectConfigDao.xml | 6 ++ 8 files changed, 145 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 a1262f24..22580346 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author 逗 @@ -38,7 +39,23 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(playerList); } + @MustLogin + @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "") + @RequestMapping(value = "countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询比赛项目上的参赛选手列表：{}",params); + List countScoreList = competeService.countScore(params.getParam()); + return JsonResponse.newInstance().ok(countScoreList); + } + @MustLogin + @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); + competeService.countScoreDetail(params.getParam()); + return JsonResponse.newInstance().ok(); + } } 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 af6d9117..2127cac3 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 @@ -325,5 +325,14 @@ public class CompeteDto { private String idCard; } + @Data + @ApiModel("项目id和组别id") + public static class ProjectIdAndGroupId{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("组别id") + private Long groupId; + } + } 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 2c46dd01..917ec421 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 @@ -452,4 +452,30 @@ public class CompeteVo { private String otherPlayerName; } + @Data + @ApiModel("项目，开始时间和比赛状态") + public static class CountScore{ + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目状态") + private int status; + } + + @Data + @ApiModel("得分享请") + public static class CountScoreDetail{ + @ApiModelProperty("参赛队伍") + private String companyName; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("成绩") + private Long grade; + + } + + } 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 9112c99a..e3c6e4db 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 @@ -18,4 +18,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { List selectDetail (); List selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); List selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); } \ No newline at end of file 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 c6f2ca97..aa5ab32d 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -14,10 +14,7 @@ import com.ccsens.mt.bean.dto.LevelDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.TableVo; -import com.ccsens.mt.persist.dao.CompeteEnrollDao; -import com.ccsens.mt.persist.dao.CompetePlayerDao; -import com.ccsens.mt.persist.dao.CompeteTeamDao; -import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; import com.ccsens.mt.util.Constant; import com.ccsens.util.*; @@ -82,7 +79,8 @@ public class CompeteService implements ICompeteService { private TallFeignClient tallFeignClient; @Resource private CommonFileMapper commonFileMapper; - + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; /** * 查看第几届 */ @@ -896,6 +894,8 @@ public class CompeteService implements ICompeteService { } + + /** * 验证数据的正确性，存入数据库 */ @@ -1008,8 +1008,71 @@ public class CompeteService implements ICompeteService { } + @Override + public List countScore(CompeteDto.CompeteTime params) { + List countScoreList = new ArrayList<>(); + //查询项目 + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getCompeteTimeId()); + CompeteProjectExample competeProjectExample = new CompeteProjectExample(); + int level = 2; + competeProjectExample.createCriteria().andTypeEqualTo(competeTime.getType()).andLevelEqualTo((byte) level); + //项目集合 + List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); + for(CompeteProject competeProject : competeProjectList) { + long projectId = competeProject.getId(); + CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId); + if (ObjectUtil.isNotNull(competeProjectConfig)) { + CompeteVo.CountScore countScore = new CompeteVo.CountScore(); + countScore.setId(competeProject.getId()); + countScore.setProjectName(competeProject.getName()); + countScore.setStartTime(competeProjectConfig.getStartTime()); + //状态判断 + long currentTime = System.currentTimeMillis(); + if (currentTime < competeProjectConfig.getStartTime()) { + //未开始0-未开始 + countScore.setStatus(0); + } + if (currentTime > competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() > currentTime) { + //进行中1-进行中 + countScore.setStatus(1); + } + if (competeProjectConfig.getEndTime() < currentTime) { + //已经结束-结束 + countScore.setStatus(2); + } + countScoreList.add(countScore); + } + } + return countScoreList; + } + @Override + public List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) { + //判断比赛类型 + long ProjectId = params.getProjectId(); + long groupId = params.getGroupId(); + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(ProjectId); + int team = competeProject.getTeam(); + long fatherId = competeProject.getParentId(); + //如果比赛是个人计数赛 + if (fatherId == 2001 && team == 0){ + CompeteProjectPlayerExample competeProjectPlayerExample= new CompeteProjectPlayerExample(); + + } + //如果是个人花样赛 + if (fatherId == 2002 && team == 0){ + + } + //如果是团队计数赛 + if (fatherId == 2001 && team == 1){ + } + //如果是团队花样赛 + if (fatherId == 2002 && team == 1){ + + } + return null; + } } \ 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 84cf068a..eca520a8 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -149,6 +149,22 @@ public interface ICompeteService { List signupImport(String path) throws FileNotFoundException, Exception; + + /** + * 项目，开始时间和比赛状态 + * @param params 大赛id和比赛项目id + * @return 返回项目，开始时间和比赛状态 + */ + List countScore(CompeteDto.CompeteTime params) ; + + /** + * 得分详情 + * @param params 大赛id和比赛项目id + * @return 返回项目，开始时间和比赛状态 + */ + List countScoreDetail(CompeteDto.ProjectIdAndGroupId 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 d8c89a2d..b56874c0 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -24,6 +24,12 @@ FROM t_compete_project_config a , t_compete_project b where a.project_id = b.id + + + SELECT + tcp.`name` as name, + tcc.`name` as companyName, + tccs.final_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 + LEFT JOIN t_compete_count_score tccs on tccs.site_order_id = tcso.id + LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id + WHERE tcpp.rec_status = 0 + and tcp.rec_status=0 + and tcso.rec_status=0 + and tccs.rec_status=0 + and tcc.rec_status = 0 + and tcpp.project_id= #{projectId} + and tcpp.compete_group_id =#{competeGroupId} + GROUP BY tccs.final_score + + + + + + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 3fba3694..6f586d68 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,16 +3,16 @@ + - - - - + + + - + @@ -76,8 +76,8 @@ - id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, + id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -111,15 +113,15 @@ - insert into t_compete_count_score (id, compete_time_id, project_id, - site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, + insert into t_compete_count_score (id, should_times, compete_time_id, + project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, - #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, - #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, + #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -128,6 +130,9 @@ id, + + should_times, + compete_time_id, @@ -146,9 +151,6 @@ judgment_b_score2, - - should_times, - deduct_times, @@ -172,6 +174,9 @@ #{id,jdbcType=BIGINT}, + + #{shouldTimes,jdbcType=INTEGER}, + #{competeTimeId,jdbcType=BIGINT}, @@ -182,16 +187,13 @@ #{siteOrderId,jdbcType=BIGINT}, - #{chiefJudgmentScore,jdbcType=BIGINT}, + #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=INTEGER}, - - - #{shouldTimes,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, @@ -200,7 +202,7 @@ #{deductCause,jdbcType=VARCHAR}, - #{finalScore,jdbcType=INTEGER}, + #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, @@ -225,6 +227,9 @@ id = #{record.id,jdbcType=BIGINT}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -235,16 +240,13 @@ site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, @@ -253,7 +255,7 @@ deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -272,16 +274,16 @@ update t_compete_count_score set id = #{record.id,jdbcType=BIGINT}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -302,16 +304,13 @@ site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, @@ -320,7 +319,7 @@ deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -333,22 +332,23 @@ where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - should_times = #{shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml index 12ac81e2..f4b26c7c 100644 --- a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml @@ -7,7 +7,7 @@ - + @@ -111,7 +111,7 @@ judgment_id, created_at, updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -166,7 +166,7 @@ #{code,jdbcType=VARCHAR}, - #{score,jdbcType=INTEGER}, + #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, @@ -207,7 +207,7 @@ code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, @@ -233,7 +233,7 @@ project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, @@ -258,7 +258,7 @@ code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, @@ -281,7 +281,7 @@ project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, From acb605c61c5109881ac260505450d733ec2c77ed Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 19:37:21 +0800 Subject: [PATCH 3/4] 11-13-2 --- mt/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test From eb0613044ac0ddb92ca786932f96479b10cacf11 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 19:40:26 +0800 Subject: [PATCH 4/4] 11-13-2 --- .../main/java/com/ccsens/mt/api/CompeteScoreController.java | 5 ++--- .../com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java | 5 ++--- 2 files changed, 4 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 4c19f8df..f5715c4b 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -58,7 +58,7 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(competeScores); } -<<<<<<< HEAD + @MustLogin @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "") @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -77,6 +77,5 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(); } -======= ->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041 + } 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 5281dc9c..6f31e47b 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 @@ -18,9 +18,8 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { List selectDetail (); List selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); List selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); -<<<<<<< HEAD CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); -======= + /** * 查询所有项目配置信息 @@ -28,5 +27,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { * @return 返回所有比赛日程配置信息 */ List queryProjectConfig(@Param("type")int type); ->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041 + } \ No newline at end of file