ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

20201126v1.9修改裁判信息

tiaosheng
zy_Java 5 years ago
parent
0fb43894d9
commit
cccaee8585
2 changed files with 124 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java
  2. 136
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

10
cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java
View File

@ -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<TallFeignClient> {
return JsonResponse.newInstance().fail();
}
@Override
public JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember) {
return JsonResponse.newInstance().fail();
}
@Override
public JsonResponse<MemberVo.MemberList> queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone) {
return JsonResponse.newInstance().fail();

136
mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
View File

@ -347,6 +347,100 @@ public class CompeteTaskService implements ICompeteTaskService {
List<CompeteJudgment> 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<MemberVo.Member> 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<MemberVo.MemberList> 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();

Write Preview
Loading…
Cancel
Save