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
Unified 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. 116
      mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java
  3. 148
      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; private Long memberId;
@ApiModelProperty("成员名") @ApiModelProperty("成员名")
private String memberName; private String memberName;
@ApiModelProperty("userId")
private Long userId;
} }
} }

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

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

148
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); JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse); log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse);
//失败return //失败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; return;
} }
} }
@ -192,7 +197,12 @@ public class CompeteTaskService implements ICompeteTaskService {
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
//异常return //异常return
log.info("添加任务后返回：{}", normalTaskJsonResponse); 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; return;
} }
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
@ -421,44 +431,44 @@ public class CompeteTaskService implements ICompeteTaskService {
@Override @Override
public List<ProvinceCompeteVo.QueryJudgment> queryJudgment(ProvinceCompeteDto.QueryJudgment param) { public List<ProvinceCompeteVo.QueryJudgment> queryJudgment(ProvinceCompeteDto.QueryJudgment param) {
List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(), param.getProjectId()); List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(), param.getProjectId());
if (CollectionUtil.isNotEmpty(queryJudgmentList)) { // if (CollectionUtil.isNotEmpty(queryJudgmentList)) {
queryJudgmentList.forEach(projectJudgment -> { // queryJudgmentList.forEach(projectJudgment -> {
// for(ProvinceCompeteVo.QueryJudgment projectJudgment : queryJudgmentList){ //// for(ProvinceCompeteVo.QueryJudgment projectJudgment : queryJudgmentList){
//裁判数量 // //裁判数量
int count = projectJudgment.getProjectType() == 0 ? 3 : 7; // int count = projectJudgment.getProjectType() == 0 ? 3 : 7;
for (int i = 0; i < projectJudgment.getSiteNums(); i++) { // for (int i = 0; i < projectJudgment.getSiteNums(); i++) {
if (i < projectJudgment.getSiteList().size()) { // if (i < projectJudgment.getSiteList().size()) {
ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); // ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i);
if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { // if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) {
siteJudgment.setJudgmentList(new ArrayList<>()); // siteJudgment.setJudgmentList(new ArrayList<>());
} // }
int a = siteJudgment.getJudgmentList().size(); // int a = siteJudgment.getJudgmentList().size();
for (int j = 0; j < count - a; j++) { // for (int j = 0; j < count - a; j++) {
ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); // ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
siteJudgment1.setJudgmentNum(a + j); // siteJudgment1.setJudgmentNum(a + j);
siteJudgment.getJudgmentList().add(siteJudgment1); // siteJudgment.getJudgmentList().add(siteJudgment1);
} // }
} else { // } else {
int a = projectJudgment.getSiteList().size(); // int a = projectJudgment.getSiteList().size();
System.out.println("==========="+ a); //// System.out.println("==========="+ a);
System.out.println("==========="+ projectJudgment.getSiteNums()); //// System.out.println("==========="+ projectJudgment.getSiteNums());
System.out.println("==========="+ (projectJudgment.getSiteNums()-a)); //// System.out.println("==========="+ (projectJudgment.getSiteNums()-a));
for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) { // for (int j = 0; j < projectJudgment.getSiteNums() - a; j++) {
ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite(); // ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite();
siteJudgment.setSiteNum(a + j + 1); // siteJudgment.setSiteNum(a + j + 1);
projectJudgment.getSiteList().add(siteJudgment); // projectJudgment.getSiteList().add(siteJudgment);
int b = siteJudgment.getJudgmentList().size(); // int b = siteJudgment.getJudgmentList().size();
for (int x = 0; x < count - b; x++) { // for (int x = 0; x < count - b; x++) {
ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); // ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment();
siteJudgment1.setJudgmentNum(b + x); // siteJudgment1.setJudgmentNum(b + x);
siteJudgment.getJudgmentList().add(siteJudgment1); // siteJudgment.getJudgmentList().add(siteJudgment1);
} // }
} // }
} // }
} // }
// } //// }
}); // });
} // }
return queryJudgmentList; return queryJudgmentList;
} }
@ -532,7 +542,12 @@ public class CompeteTaskService implements ICompeteTaskService {
JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole); JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
log.info("添加角色后返回：{}", roleJsonResponse); log.info("添加角色后返回：{}", roleJsonResponse);
//失败return //失败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; return;
} }
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
@ -554,37 +569,60 @@ public class CompeteTaskService implements ICompeteTaskService {
Long userId = null; Long userId = null;
//失败return //失败return
if (ObjectUtil.isNull(memberJsonResponse)) { if (ObjectUtil.isNull(memberJsonResponse)) {
log.info("调用tall返回null");
return; return;
} }
if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){ if(memberJsonResponse.getCode() != 200 && memberJsonResponse.getCode() != 21){
log.info("调用tall异常后返回：{}", memberJsonResponse.getMsg());
return; return;
} }
if(roleJsonResponse.getCode() == 200){ if(roleJsonResponse.getCode() == 200){
MemberVo.Member member = memberJsonResponse.getData(); MemberVo.Member member = memberJsonResponse.getData();
userId = member.getUserId(); if(ObjectUtil.isNotNull(member)){
userId = member.getUserId();
}
} }
//code等于21代表成员已存在 //code等于21代表成员已存在
if (memberJsonResponse.getCode() == 21) { if (memberJsonResponse.getCode() == 21) {
log.info("该成员已存在：{}", memberJsonResponse.getMsg());
//查询该手机号在项目内的成员的id //查询该手机号在项目内的成员的id
MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone();
getMemberByPhone.setProjectId(tallProjectId); getMemberByPhone.setProjectId(tallProjectId);
getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone());
getMemberByPhone.setToken(token); getMemberByPhone.setToken(token);
log.info("查找该手机号以前的成员信息：{}", judgmentInfo.getJudgmentPhone());
JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); JsonResponse<MemberVo.MemberList> memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone);
if (ObjectUtil.isNotNull(memberListJsonResponse)) { log.info("查找该手机号以前的成员信息返回：{}", memberListJsonResponse);
MemberVo.MemberList memberList = memberListJsonResponse.getData(); //失败return
if (ObjectUtil.isNotNull(memberList)) { if (ObjectUtil.isNull(memberListJsonResponse)) {
memberId = memberList.getMemberId(); 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)) { if (ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)) {
MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole();
saveMemberInRole.setRoleId(roleId); saveMemberInRole.setRoleId(roleId);
saveMemberInRole.setMemberId(memberId); saveMemberInRole.setMemberId(memberId);
saveMemberInRole.setToken(token); saveMemberInRole.setToken(token);
log.info("将该成员添加至角色内");
JsonResponse jsonResponse = tallFeignClient.saveMemberInRole(saveMemberInRole); 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; return;
} }
} }
@ -610,7 +648,12 @@ public class CompeteTaskService implements ICompeteTaskService {
log.info("在tall内添加任务：{}", addTask); log.info("在tall内添加任务：{}", addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask); JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
log.info("添加任务后返回：{}", normalTaskJsonResponse); 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; return;
} }
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
@ -624,7 +667,12 @@ public class CompeteTaskService implements ICompeteTaskService {
log.info("修改tall内任务插件配置：{}", updatePluginConfig); log.info("修改tall内任务插件配置：{}", updatePluginConfig);
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); 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; return;
} }
} }

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

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

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

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

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

@ -36,7 +36,9 @@
FROM FROM
t_compete_project p LEFT JOIN t_compete_time ct on p.type = ct.type 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 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) 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 WHERE
ct.id = #{competeTimeId} ct.id = #{competeTimeId}
<if test="projectId != null"> <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 startOrder.rec_status = 0
AND team.rec_status = 0 AND team.rec_status = 0
AND tm.rec_status = 0 AND tm.rec_status = 0
group by score.id) t1, group by score.id) t1
left join
(SELECT (SELECT
CONCAT( CONCAT(
CASE team.group_remark WHEN 1 THEN '小学' WHEN 2 THEN '中学' WHEN 3 THEN '高职院校' WHEN 4 THEN '本科院校' ELSE '俱乐部'END, 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 team.rec_status = 0
AND tm.rec_status = 0 AND tm.rec_status = 0
group by score.id) t2 group by score.id) t2
WHERE on
t1.groupName = t2.groupName t1.groupName = t2.groupName
AND t1.finalScore &lt;= t2.finalScore AND t1.finalScore &lt; t2.finalScore
GROUP BY t1.groupName, t1.name GROUP BY t1.groupName, t1.name
order by rangee desc order by rangee desc
</select> </select>
<select id="queryCountScorePerson" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScorePublicity"> <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 (SELECT
competeGroup.group_name as groupName, competeGroup.group_name as groupName,
player.NAME as name, player.NAME as name,
@ -667,7 +667,8 @@
AND score.rec_status = 0 AND score.rec_status = 0
AND player.rec_status = 0 AND player.rec_status = 0
AND startOrder.rec_status = 0 AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0)t1, AND competeGroup.rec_status = 0)t1
left join
(SELECT (SELECT
competeGroup.group_name as groupName, competeGroup.group_name as groupName,
player.NAME as name, player.NAME as name,
@ -696,7 +697,7 @@
AND player.rec_status = 0 AND player.rec_status = 0
AND startOrder.rec_status = 0 AND startOrder.rec_status = 0
AND competeGroup.rec_status = 0)t2 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 group by t1.id
order by t1.groupName, rangee order by t1.groupName, rangee
</select> </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; private Long memberId;
@ApiModelProperty("成员名") @ApiModelProperty("成员名")
private String memberName; 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 = new ProjectVo.MemberList();
member.setMemberId(memberList.get(0).getId()); member.setMemberId(memberList.get(0).getId());
member.setMemberName(memberList.get(0).getNickname()); member.setMemberName(memberList.get(0).getNickname());
member.setUserId(memberList.get(0).getUserId());
} }
return member; return member;
} }

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

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

Write Preview
Loading…
Cancel
Save