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
Lihong@123456 5 years ago
parent
c6ec4a34b6 f36c5ccb0b
commit
d3d65528fb
10 changed files with 157 additions and 139 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. 2
      cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java
  2. 38
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java
  3. 138
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  4. 2
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  5. 4
      mt/src/main/resources/application.yml
  6. 2
      mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml
  7. 15
      mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
  8. 2
      tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java
  9. 1
      tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
  10. 4
      tall/src/main/resources/application.yml

2
cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java
View File

@ -51,5 +51,7 @@ public class MemberVo {
private Long memberId;
@ApiModelProperty("成员名")
private String memberName;
@ApiModelProperty("userId")
private Long userId;
}
}

38
mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java
View File

@ -1,4 +1,3 @@
package com.ccsens.mt.bean.po;
import java.io.Serializable;
@ -38,40 +37,3 @@ public class CompeteCountScoreKey implements Serializable {
return sb.toString();
}
}
//public class CompeteCountScoreKey implements Serializable {
// private Long id;
//
// private Integer shouldTimes;
//
// private static final long serialVersionUID = 1L;
//
// public Long getId() {
// return id;
// }
//
// public void setId(Long id) {
// this.id = id;
// }
//
// public Integer getShouldTimes() {
// return shouldTimes;
// }
//
// public void setShouldTimes(Integer shouldTimes) {
// this.shouldTimes = shouldTimes;
// }
//
// @Override
// public String toString() {
// StringBuilder sb = new StringBuilder();
// sb.append(getClass().getSimpleName());
// sb.append(" [");
// sb.append("Hash = ").append(hashCode());
// sb.append(", id=").append(id);
// sb.append(", shouldTimes=").append(shouldTimes);
// sb.append("]");
// return sb.toString();
// }
//}

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

@ -172,7 +172,12 @@ public class CompeteTaskService implements ICompeteTaskService {
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse);
//失败return
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
return;
}
}
@ -192,7 +197,12 @@ public class CompeteTaskService implements ICompeteTaskService {
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
//异常return
log.info("添加任务后返回：{}", normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
return;
}
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
@ -421,44 +431,44 @@ public class CompeteTaskService implements ICompeteTaskService {
@Override
public List<ProvinceCompeteVo.QueryJudgment> queryJudgment(ProvinceCompeteDto.QueryJudgment param) {
List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(), param.getProjectId());
if (CollectionUtil.isNotEmpty(queryJudgmentList)) {
queryJudgmentList.forEach(projectJudgment -> {
// for(ProvinceCompeteVo.QueryJudgment projectJudgment : queryJudgmentList){
//裁判数量
int count = projectJudgment.getProjectType() == 0 ? 3 : 7;
for (int i = 0; i < projectJudgment.getSiteNums(); i++) {
if (i < projectJudgment.getSiteList().size()) {
ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i);
if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) {
siteJudgment.setJudgmentList(new ArrayList<>());
}
int a = siteJudgment.getJudgmentList().size();
for (int j = 0; j < count - a; j++) {
ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
siteJudgment1.setJudgmentNum(a + j);
siteJudgment.getJudgmentList().add(siteJudgment1);
}
} else {
int a = projectJudgment.getSiteList().size();
System.out.println("==========="+ a);
System.out.println("==========="+ projectJudgment.getSiteNums());
System.out.println("==========="+ (projectJudgment.getSiteNums()-a));
for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) {
ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite();
siteJudgment.setSiteNum(a + j + 1);
projectJudgment.getSiteList().add(siteJudgment);
int b = siteJudgment.getJudgmentList().size();
for (int x = 0; x < count - b; x++) {
ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
siteJudgment1.setJudgmentNum(b + x);
siteJudgment.getJudgmentList().add(siteJudgment1);
}
}
}
}
// if (CollectionUtil.isNotEmpty(queryJudgmentList)) {
// queryJudgmentList.forEach(projectJudgment -> {
//// for(ProvinceCompeteVo.QueryJudgment projectJudgment : queryJudgmentList){
// //裁判数量
// int count = projectJudgment.getProjectType() == 0 ? 3 : 7;
// for (int i = 0; i < projectJudgment.getSiteNums(); i++) {
// if (i < projectJudgment.getSiteList().size()) {
// ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i);
// if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) {
// siteJudgment.setJudgmentList(new ArrayList<>());
// }
// int a = siteJudgment.getJudgmentList().size();
// for (int j = 0; j < count - a; j++) {
// ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
// siteJudgment1.setJudgmentNum(a + j);
// siteJudgment.getJudgmentList().add(siteJudgment1);
// }
// } else {
// int a = projectJudgment.getSiteList().size();
//// System.out.println("==========="+ a);
//// System.out.println("==========="+ projectJudgment.getSiteNums());
//// System.out.println("==========="+ (projectJudgment.getSiteNums()-a));
// for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) {
// ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite();
// siteJudgment.setSiteNum(a + j + 1);
// projectJudgment.getSiteList().add(siteJudgment);
// int b = siteJudgment.getJudgmentList().size();
// for (int x = 0; x < count - b; x++) {
// ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
// siteJudgment1.setJudgmentNum(b + x);
// siteJudgment.getJudgmentList().add(siteJudgment1);
// }
// }
// }
// }
//// }
// });
// }
});
}
return queryJudgmentList;
}
@ -532,7 +542,12 @@ public class CompeteTaskService implements ICompeteTaskService {
JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
log.info("添加角色后返回：{}", roleJsonResponse);
//失败return
if (ObjectUtil.isNull(roleJsonResponse) || roleJsonResponse.getCode() != 200) {
if (ObjectUtil.isNull(roleJsonResponse)) {
log.info("调用tall返回null");
return;
}
if( roleJsonResponse.getCode() != 200) {
log.info("调用tall异常后返回：{}", roleJsonResponse.getMsg());
return;
}
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
@ -554,37 +569,60 @@ public class CompeteTaskService implements ICompeteTaskService {
Long userId = null;
//失败return
if (ObjectUtil.isNull(memberJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){
log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
return;
}
if(roleJsonResponse.getCode() == 200){
MemberVo.Member member = memberJsonResponse.getData();
if(ObjectUtil.isNotNull(member)){
userId = member.getUserId();
}
}
//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);
if (ObjectUtil.isNotNull(memberListJsonResponse)) {
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(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) || jsonResponse.getCode() != 200) {
if (ObjectUtil.isNull(jsonResponse)) {
log.info("调用tall返回null");
return;
}
if(jsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
return;
}
}
@ -610,7 +648,12 @@ public class CompeteTaskService implements ICompeteTaskService {
log.info("在tall内添加任务：{}", addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
log.info("添加任务后返回：{}", normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) {
if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
return;
}
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
@ -624,7 +667,12 @@ public class CompeteTaskService implements ICompeteTaskService {
log.info("修改tall内任务插件配置：{}", updatePluginConfig);
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
if (ObjectUtil.isNull(pluginVoJsonResponse) || pluginVoJsonResponse.getCode() != 200) {
if (ObjectUtil.isNull(pluginVoJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(pluginVoJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg());
return;
}
}

2
mt/src/main/java/com/ccsens/mt/service/ExcelService.java
View File

@ -1740,7 +1740,7 @@ public class ExcelService implements IExcelService {
} else {
for (int i = 0; i < eights.size(); i++) {
List<PoiUtil.PoiUtilCell> cells = new ArrayList<>();
cells.add(new PoiUtil.PoiUtilCell("第" + i + "名"));
cells.add(new PoiUtil.PoiUtilCell("第" + (i + 1) + "名"));
cells.add(new PoiUtil.PoiUtilCell(eights.get(i).getEightNames(), 8, 1));
raws.add(cells);
}

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

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

2
mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml
View File

@ -36,7 +36,9 @@
FROM
t_compete_project p LEFT JOIN t_compete_time ct on p.type = ct.type
LEFT JOIN t_compete_project_config pc on p.id = pc.project_id
LEFT JOIN (SELECT 1 as nums union All SELECT 2 as nums union All SELECT 3 as nums) n on 1=1
LEFT JOIN t_compete_judgment j on j.project_id = p.id and (j.rec_status = 0 or j.rec_status IS NULL)
and j.chief_judgment = n.nums
WHERE
ct.id = #{competeTimeId}
<if test="projectId != null">

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

@ -597,8 +597,8 @@
AND startOrder.rec_status = 0
AND team.rec_status = 0
AND tm.rec_status = 0
group by score.id) t1,
group by score.id) t1
left join
(SELECT
CONCAT(
CASE team.group_remark WHEN 1 THEN '小学' WHEN 2 THEN '中学' WHEN 3 THEN '高职院校' WHEN 4 THEN '本科院校' ELSE '俱乐部'END,
@ -632,14 +632,14 @@
AND team.rec_status = 0
AND tm.rec_status = 0
group by score.id) t2
WHERE
on
t1.groupName = t2.groupName
AND t1.finalScore &lt;= t2.finalScore
AND t1.finalScore &lt; t2.finalScore
GROUP BY t1.groupName, t1.name
order by rangee desc
</select>
<select id="queryCountScorePerson" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity">
select t1.*, count(t2.id) as rangee from
select t1.*, count(t2.id) + 1 as rangee from
(SELECT
competeGroup.group_name as groupName,
player.NAME as name,
@ -667,7 +667,8 @@
AND score.rec_status = 0
AND player.rec_status = 0
AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0)t1,
AND competeGroup.rec_status = 0)t1
left join
(SELECT
competeGroup.group_name as groupName,
player.NAME as name,
@ -696,7 +697,7 @@
AND player.rec_status = 0
AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0)t2
where t1.groupName = t2.groupName and t1.finalScore &lt;= t2.finalScore
on t1.groupName = t2.groupName and t1.finalScore &lt; t2.finalScore
group by t1.id
order by t1.groupName, rangee
</select>

2
tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java
View File

@ -367,6 +367,8 @@ public class ProjectVo {
private Long memberId;
@ApiModelProperty("成员名")
private String memberName;
@ApiModelProperty("userId")
private Long userId;
}

1
tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
View File

@ -457,6 +457,7 @@ public class ProMemberService implements IProMemberService {
member = new ProjectVo.MemberList();
member.setMemberId(memberList.get(0).getId());
member.setMemberName(memberList.get(0).getNickname());
member.setUserId(memberList.get(0).getUserId());
}
return member;
}

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

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

Write Preview
Loading…
Cancel
Save