From cccaee8585c23b8580c75fb060ccd79d981cb7db Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 26 Nov 2020 17:47:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?20201126v1.9=E4=BF=AE=E6=94=B9=E8=A3=81?= =?UTF-8?q?=E5=88=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudutil/feign/TallFeignClient.java | 10 ++ .../ccsens/mt/service/CompeteTaskService.java | 136 +++++++++++++++--- 2 files changed, 124 insertions(+), 22 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 86337fd7..65a55a79 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -220,6 +220,11 @@ public interface TallFeignClient { */ @RequestMapping("/roles/saveMember") JsonResponse saveMemberInRole(MemberRoleDto.SaveMemberInRole saveMember); + /** + * 将成员从角色内删除 + */ + @RequestMapping("/roles/deleteMember") + JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember); /** @@ -375,6 +380,11 @@ class TallFeignClientFallBack implements FallbackFactory { return JsonResponse.newInstance().fail(); } + @Override + public JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember) { + return JsonResponse.newInstance().fail(); + } + @Override public JsonResponse queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone) { return JsonResponse.newInstance().fail(); 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 5572bedf..236000e5 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -347,6 +347,100 @@ public class CompeteTaskService implements ICompeteTaskService { List competeJudgmentList = competeJudgmentDao.selectByExample(competeJudgmentExample); if (CollectionUtil.isNotEmpty(competeJudgmentList)) { competeJudgment = competeJudgmentList.get(0); + Long userId = null; + Long memberId = null; + if(!judgmentInfo.getJudgmentPhone().equalsIgnoreCase(competeJudgment.getPhone())){ + //添加成员 + MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); + saveMember.setMemberName(judgmentInfo.getJudgmentName()); + saveMember.setProjectId(tallProjectId); + saveMember.setPhone(judgmentInfo.getJudgmentPhone()); + saveMember.setRoleId(Arrays.asList(competeJudgment.getRoleId())); + saveMember.setToken(token); + log.info("在tall内添加成员：{}", saveMember); + JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); + log.info("添加成员后返回：{}", memberJsonResponse); + //如果成员已存在，查询成员信息然后添加至角色内 + //失败return + if (ObjectUtil.isNull(memberJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){ + log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); + return; + } + if(memberJsonResponse.getCode() == 200){ + MemberVo.Member member = memberJsonResponse.getData(); + if(ObjectUtil.isNotNull(member)){ + userId = member.getUserId(); + memberId = member.getMemberId(); + } + } + //code等于21代表成员已存在 + if (memberJsonResponse.getCode() == 21) { + log.info("该成员已存在：{}", memberJsonResponse.getMsg()); + //查询该手机号在项目内的成员的id + MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); + getMemberByPhone.setProjectId(tallProjectId); + getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); + getMemberByPhone.setToken(token); + log.info("查找该手机号以前的成员信息：{}", judgmentInfo.getJudgmentPhone()); + JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); + log.info("查找该手机号以前的成员信息返回：{}", memberListJsonResponse); + //失败return + if (ObjectUtil.isNull(memberListJsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(memberListJsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); + return; + } + + MemberVo.MemberList memberList = memberListJsonResponse.getData(); + if (ObjectUtil.isNotNull(memberList)) { + memberId = memberList.getMemberId(); + userId = memberList.getUserId(); + } + } + //将该成员添加至角色下 + if (ObjectUtil.isNotNull(competeJudgment.getRoleId()) && ObjectUtil.isNotNull(competeJudgment.getMemberId())) { + MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); + saveMemberInRole.setRoleId(competeJudgment.getRoleId()); + saveMemberInRole.setMemberId(competeJudgment.getMemberId()); + saveMemberInRole.setToken(token); + log.info("将该成员添加至角色内"); + JsonResponse jsonResponse = tallFeignClient.deleteMemberInRole(saveMemberInRole); + if (ObjectUtil.isNull(jsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(jsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", jsonResponse.getMsg()); + return; + } + } + //将该成员添加至角色下 + if (ObjectUtil.isNotNull(competeJudgment.getRoleId()) && ObjectUtil.isNotNull(memberId)) { + MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); + saveMemberInRole.setRoleId(competeJudgment.getRoleId()); + saveMemberInRole.setMemberId(memberId); + saveMemberInRole.setToken(token); + log.info("将该成员添加至角色内"); + JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); + if (ObjectUtil.isNull(jsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(jsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", jsonResponse.getMsg()); + return; + } + } + } + //删除旧成员角色关联 + //添加新成员角色关联 competeJudgment.setName(judgmentInfo.getJudgmentName()); competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); competeJudgment.setRemark(judgmentInfo.getRemark()); @@ -354,10 +448,10 @@ public class CompeteTaskService implements ICompeteTaskService { competeJudgment.setProjectId(project.getId()); competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); + competeJudgment.setUserId(userId); + competeJudgment.setRoleId(memberId); competeJudgmentDao.updateByPrimaryKeySelective(competeJudgment); - //修改角色 - //修改成员 - //修改任务 + } else { // TODO //添加角色 @@ -410,7 +504,7 @@ public class CompeteTaskService implements ICompeteTaskService { log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg()); return; } - if(roleJsonResponse.getCode() == 200){ + if(memberJsonResponse.getCode() == 200){ MemberVo.Member member = memberJsonResponse.getData(); if(ObjectUtil.isNotNull(member)){ userId = member.getUserId(); @@ -442,26 +536,24 @@ public class CompeteTaskService implements ICompeteTaskService { memberId = memberList.getMemberId(); userId = memberList.getUserId(); } - - //将该成员添加至角色下 - if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) { - MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); - saveMemberInRole.setRoleId(roleId); - saveMemberInRole.setMemberId(memberId); - saveMemberInRole.setToken(token); - log.info("将该成员添加至角色内"); - JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); - if (ObjectUtil.isNull(jsonResponse)) { - log.info("调用tall返回null"); - return; - } - if(jsonResponse.getCode() != 200){ - log.info("调用tall异常后返回：{}", jsonResponse.getMsg()); - return; - } + } + //将该成员添加至角色下 + if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) { + MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); + saveMemberInRole.setRoleId(roleId); + saveMemberInRole.setMemberId(memberId); + saveMemberInRole.setToken(token); + log.info("将该成员添加至角色内"); + JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); + if (ObjectUtil.isNull(jsonResponse)) { + log.info("调用tall返回null"); + return; + } + if(jsonResponse.getCode() != 200){ + log.info("调用tall异常后返回：{}", jsonResponse.getMsg()); + return; } } - //添加任务 //查找场次信息表 CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); From a6f07487048644b3792f1dd6319f78f424cffe1d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 26 Nov 2020 19:12:14 +0800 Subject: [PATCH 2/4] 20201126v1.9 --- .../cloudutil/bean/tall/dto/MemberRoleDto.java | 9 +++++++++ .../cloudutil/feign/TallFeignClient.java | 11 +++++++++++ .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 2 +- .../com/ccsens/mt/service/CompeteService.java | 4 ++-- .../ccsens/mt/service/CompeteTaskService.java | 18 ++++++++++++++++++ mt/src/main/resources/application.yml | 4 ++-- .../resources/mapper_dao/CompeteScoreDao.xml | 13 +++++++++---- .../ccsens/tall/service/ProRoleService.java | 10 ++++++++++ 8 files changed, 62 insertions(+), 9 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java index 25f734d0..c8b10729 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java @@ -135,4 +135,13 @@ public class MemberRoleDto { @ApiModelProperty("token") private String token; } + + @Data + @ApiModel("给角色添加成员") + public static class DeleteRole{ + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("token") + private String token; + } } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 65a55a79..a2a5e957 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -232,6 +232,12 @@ public interface TallFeignClient { */ @RequestMapping("/members/query/memberByPhone") JsonResponse queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone); + + /** + * 删除角色 + */ + @RequestMapping("/roles/delete") + JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole); } @Slf4j @@ -389,6 +395,11 @@ class TallFeignClientFallBack implements FallbackFactory { public JsonResponse queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone) { return JsonResponse.newInstance().fail(); } + + @Override + public JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole) { + return JsonResponse.newInstance().fail(); + } }; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 10073a4b..58c2bdc0 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -130,7 +130,7 @@ public class ScoreDto { @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("当前页") - private int page=1; + private int pageNum=1; @ApiModelProperty("每页数量") private int size=10; } 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 f7dea15c..1438baec 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1699,7 +1699,7 @@ public class CompeteService implements ICompeteService { @Override public PageInfo queryCountScoreAll(ScoreDto.ShowResult params) { - PageHelper.startPage(params.getPage(),params.getSize()); + PageHelper.startPage(params.getPageNum(),params.getSize()); List countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId()); PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites); // List countScoreCurrentSiteList = new ArrayList<>(); @@ -1864,7 +1864,7 @@ public class CompeteService implements ICompeteService { throw new BaseException(CodeEnum.PARAM_ERROR); } - PageHelper.startPage(param.getPage(), param.getSize()); + PageHelper.startPage(param.getPageNum(), param.getSize()); List list; if (project.getTeam() == Constant.Compete.TEAM_YES) { // 团体赛 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 236000e5..594e14a6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -108,6 +108,24 @@ public class CompeteTaskService implements ICompeteTaskService { log.info("{},时间与之前相同",projectConfig.getProjectId()); return; } + //如果场地数量不同，则删除该项目下所有裁判，及tall内的角色 + if(projectConfig.getSiteNum() != competeProjectConfig.getSiteNum()){ + CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); + judgmentExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); + List judgmentList = competeJudgmentDao.selectByExample(judgmentExample); + if(CollectionUtil.isNotEmpty(judgmentList)){ + judgmentList.forEach(judgment ->{ + judgment.setRecStatus((byte) 2); + competeJudgmentDao.updateByPrimaryKeySelective(judgment); + + MemberRoleDto.DeleteRole deleteRole = new MemberRoleDto.DeleteRole(); + deleteRole.setRoleId(judgment.getRoleId()); + deleteRole.setToken(token); + log.info("删除角色：{}", judgment.getRoleId()); + tallFeignClient.deleteRole(deleteRole); + }); + } + } competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ 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 86ffbfeb..a6a792b2 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -702,11 +702,15 @@ order by t1.groupName, rangee - -