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

Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

tiaosheng
wang0018 5 years ago
parent
57a66fbe71 b7ddbd0be4
commit
327647f849
8 changed files with 229 additions and 70 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. 9
      cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java
  2. 21
      cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java
  3. 2
      mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java
  4. 83
      mt/src/main/java/com/ccsens/mt/service/CompeteService.java
  5. 154
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  6. 4
      mt/src/main/resources/application.yml
  7. 16
      mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
  8. 10
      tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

9
cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java
View File

@ -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;
}
}

21
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);
/**
@ -227,6 +232,12 @@ public interface TallFeignClient {
*/
@RequestMapping("/members/query/memberByPhone")
JsonResponse<MemberVo.MemberList> queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone);
/**
* 删除角色
*/
@RequestMapping("/roles/delete")
JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole);
}
@Slf4j
@ -375,10 +386,20 @@ 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();
}
@Override
public JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole) {
return JsonResponse.newInstance().fail();
}
};
}

2
mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java
View File

@ -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;
}

83
mt/src/main/java/com/ccsens/mt/service/CompeteService.java
View File

@ -1480,6 +1480,7 @@ public class CompeteService implements ICompeteService {
public PageInfo<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) {
long projectId = params.getProjectId();
long competeTimeId = params.getCompeteTimeId();
Byte type = 0;
PageHelper.startPage(params.getPage(),params.getSize());
List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
PageInfo pageInfo = new PageInfo<>(speedPassList);
@ -1487,13 +1488,13 @@ public class CompeteService implements ICompeteService {
for (CompeteVo.SpeedPass mes : speedPassList) {
//查30s单摇跳得分
CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample();
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId());
competeStartOrderExample.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type);
List<CompeteStartOrder> 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);
competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id).andRecStatusEqualTo(type);
List<CompeteCountScore> competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample);
CompeteCountScore competeCountScore = competeCountScoreList.get(0);
BigDecimal score = competeCountScore.getFinalScore();
@ -1504,13 +1505,13 @@ public class CompeteService implements ICompeteService {
}
//3分钟单摇跳得分
CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample();
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId());
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample);
competeStartOrderExample1.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type);
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample1);
if (competeStartOrders1.size() > 0) {
CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0);
CompeteStartOrder competeStartOrder1 = competeStartOrders1.get(0);
long id1 = competeStartOrder1.getId();
CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample();
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1);
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1).andRecStatusEqualTo(type);
List<CompeteCountScore> competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1);
CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0);
BigDecimal score1 = competeCountScore1.getFinalScore();
@ -1525,6 +1526,7 @@ public class CompeteService implements ICompeteService {
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);
@ -1534,45 +1536,46 @@ public class CompeteService implements ICompeteService {
BigDecimal s =mes.getSecondTime();
if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) {
//判断30s单摇跳等级
if (mes.getSecondTime().compareTo(bigDecimal0) < 1) {
if (s.compareTo(bigDecimal0) >-1 && s.compareTo(bigDecimal2) <1) {
mes.setSecondGrade(1);
}
if (mes.getSecondTime().compareTo(bigDecimal2) < 1) {
if (s.compareTo(bigDecimal2) >-1 && s.compareTo(bigDecimal3) <1) {
mes.setSecondGrade(2);
}
if (mes.getSecondTime().compareTo(bigDecimal3) < 1) {
if (s.compareTo(bigDecimal3) >-1 && s.compareTo(bigDecimal4) <1) {
mes.setSecondGrade(3);
}
if (mes.getSecondTime().compareTo(bigDecimal4) < 1) {
if (s.compareTo(bigDecimal4) >-1 && s.compareTo(bigDecimal5) <1) {
mes.setSecondGrade(4);
}
if (mes.getSecondTime().compareTo(bigDecimal5) < 1) {
if (s.compareTo(bigDecimal5) >-1 && s.compareTo(bigDecimal6) <1) {
mes.setSecondGrade(5);
}
if (mes.getSecondTime().compareTo(bigDecimal6) < 1) {
if (s.compareTo(bigDecimal6)>-1) {
mes.setSecondGrade(6);
}
//判断3分钟单摇跳等级
if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) {
BigDecimal m =mes.getMinuteTime();
if (m.compareTo(bigDecimal7) >-1 && m.compareTo(bigDecimal8)<1) {
mes.setMinuteGrade(1);
}
if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) {
if (m.compareTo(bigDecimal8) >-1&& m.compareTo(bigDecimal9) <1) {
mes.setMinuteGrade(2);
}
if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) {
if (m.compareTo(bigDecimal9) >-1&& m.compareTo(bigDecimal10) <1) {
mes.setMinuteGrade(3);
}
if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) {
if (m.compareTo(bigDecimal10)>-1 && m.compareTo(bigDecimal11)<1) {
mes.setMinuteGrade(4);
}
if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) {
if (m.compareTo(bigDecimal11)>-1 && m.compareTo(bigDecimal12)<1) {
mes.setMinuteGrade(5);
}
if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) {
if (m.compareTo(bigDecimal12)>-1) {
mes.setMinuteGrade(6);
}
//如果30s得等级小于等于3分钟得等级
@ -1590,6 +1593,7 @@ public class CompeteService implements ICompeteService {
public List<CompeteVo.SpeedPass> speedPassCha(CompeteDto.CompeteTimeAndProjectId params) {
long projectId = params.getProjectId();
long competeTimeId = params.getCompeteTimeId();
Byte type = 0;
PageHelper.startPage(params.getPage(),params.getSize());
List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
PageInfo pageInfo = new PageInfo<>(speedPassList);
@ -1597,13 +1601,13 @@ public class CompeteService implements ICompeteService {
for (CompeteVo.SpeedPass mes : speedPassList) {
//查30s单摇跳得分
CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample();
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId());
competeStartOrderExample.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type);
List<CompeteStartOrder> 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);
competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id).andRecStatusEqualTo(type);
List<CompeteCountScore> competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample);
CompeteCountScore competeCountScore = competeCountScoreList.get(0);
BigDecimal score = competeCountScore.getFinalScore();
@ -1614,13 +1618,13 @@ public class CompeteService implements ICompeteService {
}
//3分钟单摇跳得分
CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample();
competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId());
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample);
competeStartOrderExample1.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type);
List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample1);
if (competeStartOrders1.size() > 0) {
CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0);
CompeteStartOrder competeStartOrder1 = competeStartOrders1.get(0);
long id1 = competeStartOrder1.getId();
CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample();
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1);
competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1).andRecStatusEqualTo(type);
List<CompeteCountScore> competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1);
CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0);
BigDecimal score1 = competeCountScore1.getFinalScore();
@ -1635,6 +1639,7 @@ public class CompeteService implements ICompeteService {
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);
@ -1644,45 +1649,46 @@ public class CompeteService implements ICompeteService {
BigDecimal s =mes.getSecondTime();
if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) {
//判断30s单摇跳等级
if (mes.getSecondTime().compareTo(bigDecimal0) < 1) {
if (s.compareTo(bigDecimal0) >-1 && s.compareTo(bigDecimal2) <1) {
mes.setSecondGrade(1);
}
if (mes.getSecondTime().compareTo(bigDecimal2) < 1) {
if (s.compareTo(bigDecimal2) >-1 && s.compareTo(bigDecimal3) <1) {
mes.setSecondGrade(2);
}
if (mes.getSecondTime().compareTo(bigDecimal3) < 1) {
if (s.compareTo(bigDecimal3) >-1 && s.compareTo(bigDecimal4) <1) {
mes.setSecondGrade(3);
}
if (mes.getSecondTime().compareTo(bigDecimal4) < 1) {
if (s.compareTo(bigDecimal4) >-1 && s.compareTo(bigDecimal5) <1) {
mes.setSecondGrade(4);
}
if (mes.getSecondTime().compareTo(bigDecimal5) < 1) {
if (s.compareTo(bigDecimal5) >-1 && s.compareTo(bigDecimal6) <1) {
mes.setSecondGrade(5);
}
if (mes.getSecondTime().compareTo(bigDecimal6) < 1) {
if (s.compareTo(bigDecimal6)>-1) {
mes.setSecondGrade(6);
}
//判断3分钟单摇跳等级
if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) {
BigDecimal m =mes.getMinuteTime();
if (m.compareTo(bigDecimal7) >-1 && m.compareTo(bigDecimal8)<1) {
mes.setMinuteGrade(1);
}
if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) {
if (m.compareTo(bigDecimal8) >-1&& m.compareTo(bigDecimal9) <1) {
mes.setMinuteGrade(2);
}
if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) {
if (m.compareTo(bigDecimal9) >-1&& m.compareTo(bigDecimal10) <1) {
mes.setMinuteGrade(3);
}
if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) {
if (m.compareTo(bigDecimal10)>-1 && m.compareTo(bigDecimal11)<1) {
mes.setMinuteGrade(4);
}
if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) {
if (m.compareTo(bigDecimal11)>-1 && m.compareTo(bigDecimal12)<1) {
mes.setMinuteGrade(5);
}
if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) {
if (m.compareTo(bigDecimal12)>-1) {
mes.setMinuteGrade(6);
}
//如果30s得等级小于等于3分钟得等级
@ -1699,7 +1705,7 @@ public class CompeteService implements ICompeteService {
@Override
public PageInfo<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult params) {
PageHelper.startPage(params.getPage(),params.getSize());
PageHelper.startPage(params.getPageNum(),params.getSize());
List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId());
PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites);
// List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
@ -1864,7 +1870,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<ScoreVo.CountScorePublicity> list;
if (project.getTeam() == Constant.Compete.TEAM_YES) {
// 团体赛
@ -1898,6 +1904,7 @@ public class CompeteService implements ICompeteService {
//创建行对象
List<PoiUtil.PoiUtilCell> title = new ArrayList<>();
//给首行单元格赋值
title.add(new PoiUtil.PoiUtilCell("序号"));
title.add(new PoiUtil.PoiUtilCell("组别"));
title.add(new PoiUtil.PoiUtilCell("参赛单位"));
title.add(new PoiUtil.PoiUtilCell("姓名"));

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

@ -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<CompeteJudgment> 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());
@ -347,6 +365,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 +466,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 +522,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 +554,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();

4
mt/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
spring:
profiles:
active: test
include: common, util-test
active: dev
include: common, util-dev

16
mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
View File

@ -107,10 +107,7 @@
and p.rec_status = 0
and g.rec_status = 0
and c.rec_status = 0
</select>
<select id="selectQueryCountScore" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite" parameterType="java.util.Map">
SELECT @rownum:=@rownum+1 as rangee, b.* from (
SELECT
@ -702,11 +699,15 @@
order by t1.groupName, rangee
</select>
<select id="queryVarietyScore" resultType="com.ccsens.mt.bean.vo.CompeteVo$TotalScoreDisplay">
SELECT
t.*,
@rownum := @rownum + 1 AS rownum
FROM
(
select s.*, c.name as companyName, GROUP_CONCAT(p.name) as peopleName, (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 as avg1To3,
(ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 as avg4To6,
(ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 + (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 - s.referee0 as result,
case o.waiver when 1 then '弃权' when 2 then '取消比赛资格' end as remark,
@rownum := @rownum + 1 AS rownum
case o.waiver when 1 then '弃权' when 2 then '取消比赛资格' end as remark
from
(select site_order_id, max(if(chief_judgment = 0, score, null)) as referee0, max(if(chief_judgment = 1, score, null)) as referee1,
max(if(chief_judgment = 2, score, null)) as referee2, max(if(chief_judgment = 3, score, null)) as referee3,
@ -719,12 +720,13 @@
t_compete_team t,
t_compete_team_member m,
t_compete_player p,
t_compete_company c,
( SELECT @rownum := 0 ) r
t_compete_company c
where s.site_order_id = o.id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
group by s.site_order_id
order by result desc
)t,
(SELECT @rownum := 0)t1
</select>
<select id="selAllDaiBiaoDui" resultType="com.ccsens.mt.bean.vo.CompeteVo$DaiBiaoDUi">
select q.*,identity,GROUP_CONCAT(tcch.name) as name From

10
tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
View File

@ -329,6 +329,16 @@ public class ProRoleService implements IProRoleService {
//修改删除状态
role.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
proRoleDao.updateByPrimaryKeySelective(role);
//删除该角色负责的任务
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andExecutorRoleEqualTo(roleId);
List<ProTaskDetail> taskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
if(CollectionUtil.isNotEmpty(taskDetailList)){
taskDetailList.forEach(taskDetail -> {
taskDetail.setRecStatus((byte) 2);
taskDetailDao.updateByPrimaryKeySelective(taskDetail);
});
}
// //彻底删除角色
// deleteRoleByRoleId(roleId);
} else {

Write Preview
Loading…
Cancel
Save