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
574232213d eeae0934a0
commit
59f100d063
5 changed files with 204 additions and 188 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
      mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java
  2. 2
      mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
  3. 373
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  4. 4
      mt/src/main/resources/application.yml
  5. 11
      util/src/main/java/com/ccsens/util/PoiUtil.java

2
mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java
View File

@ -53,7 +53,7 @@ public class CompeteTaskController {
log.info("日程安排更新：{}",params);
String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
List<TableVo.CompeteProjectConfig> dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam(),authHeader);
log.info("日程安排更新：{}",dailyScheduleProcessList);
log.info("返回日程更新后的信息：{}",dailyScheduleProcessList);
return JsonResponse.newInstance().ok(dailyScheduleProcessList);
}

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

@ -230,7 +230,7 @@ public class ProvinceCompeteDto {
@ApiModelProperty("比赛项目项目id")
private Long projectId;
@ApiModelProperty("单项时间 单位：秒")
private long duration;
private Long duration = 0L;
@ApiModelProperty("场地数量")
private int siteNum = 1;
@ApiModelProperty("项目开始时间")

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

@ -75,6 +75,7 @@ public class CompeteTaskService implements ICompeteTaskService {
//获取比赛类型
AtomicInteger type = new AtomicInteger();
if (CollectionUtil.isEmpty(param.getUpdateCompeteTaskList())) {
log.info("项目配置为空");
return new ArrayList<>();
}
param.getUpdateCompeteTaskList().forEach(projectConfig -> {
@ -82,8 +83,10 @@ public class CompeteTaskService implements ICompeteTaskService {
if (ObjectUtil.isNull(projectConfig.getStartTime()) || projectConfig.getStartTime() == 0
|| ObjectUtil.isNull(projectConfig.getEndTime()) || projectConfig.getEndTime() == 0 ||
ObjectUtil.isNull(projectConfig.getDuration()) || projectConfig.getDuration() == 0) {
log.info("{},时间为空",projectConfig.getProjectId());
return;
}
//获取项目
CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
if (ObjectUtil.isNotNull(project)) {
@ -97,6 +100,14 @@ public class CompeteTaskService implements ICompeteTaskService {
if (CollectionUtil.isNotEmpty(projectConfigList)) {
//有则修改
competeProjectConfig = projectConfigList.get(0);
//如果时间、时长、场地数和之前一样则不修改
if(projectConfig.getStartTime().equals(competeProjectConfig.getStartTime()) &&
projectConfig.getEndTime().equals(competeProjectConfig.getEndTime())&&
projectConfig.getDuration().equals(competeProjectConfig.getProjectDuration()) &&
projectConfig.getSiteNum() == competeProjectConfig.getSiteNum()){
log.info("{},时间与之前相同",projectConfig.getProjectId());
return;
}
competeProjectConfig.setProjectDuration(projectConfig.getDuration());
competeProjectConfig.setSiteNum(projectConfig.getSiteNum());
competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime());
@ -167,18 +178,18 @@ public class CompeteTaskService implements ICompeteTaskService {
updateTaskInfo.setEndTime(competeStartOrder.getEndTime());
updateTaskInfo.setToken(token);
// TODO
// log.info("修改tall的任务信息：{}", updateTaskInfo);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
// log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse);
// //失败return
// if (ObjectUtil.isNull(normalTaskJsonResponse)) {
// log.info("调用tall返回null");
// return;
// }
// if(normalTaskJsonResponse.getCode() != 200){
// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
// return;
// }
log.info("修改tall的任务信息：{}", updateTaskInfo);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo);
log.info("修改tall的任务信息后返回：{}", normalTaskJsonResponse);
//失败return
if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
return;
}
}
log.info("修改场次信息：{}", competeStartOrder);
startOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
@ -193,22 +204,22 @@ public class CompeteTaskService implements ICompeteTaskService {
addTask.setExecutorId(tallRoleId);
addTask.setToken(token);
// TODO
// log.info("在tall内添加任务：{}", addTask);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
// //异常return
// log.info("添加任务后返回：{}", normalTaskJsonResponse);
// if (ObjectUtil.isNull(normalTaskJsonResponse)) {
// log.info("调用tall返回null");
// return;
// }
// if(normalTaskJsonResponse.getCode() != 200){
// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
// return;
// }
// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
// if (ObjectUtil.isNotNull(normalTask)) {
// taskId = normalTask.getDetailId();
// }
log.info("在tall内添加任务：{}", addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
//异常return
log.info("添加任务后返回：{}", normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
return;
}
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
if (ObjectUtil.isNotNull(normalTask)) {
taskId = normalTask.getDetailId();
}
//添加出场顺序信息
CompeteStartOrder competeStartOrder = new CompeteStartOrder();
competeStartOrder.setId(snowflake.nextId());
@ -344,159 +355,159 @@ public class CompeteTaskService implements ICompeteTaskService {
//修改任务
} else {
// TODO
// //添加角色
// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
// saveRole.setProjectId(tallProjectId);
// String jdgmentNum = "";
// if (judgmentInfo.getJudgmentNum() == 0) {
// jdgmentNum = "主裁判";
// } else {
// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum();
// }
// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum);
// Long roleId = null;
// saveRole.setToken(token);
// log.info("在tall内添加角色：{}", saveRole);
// JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
// log.info("添加角色后返回：{}", roleJsonResponse);
// //失败return
// if (ObjectUtil.isNull(roleJsonResponse)) {
// log.info("调用tall返回null");
// return;
// }
// if( roleJsonResponse.getCode() != 200) {
// log.info("调用tall异常后返回：{}", roleJsonResponse.getMsg());
// return;
// }
// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
// if (ObjectUtil.isNotNull(roleInfo)) {
// roleId = roleInfo.getRoleId();
// }
// //添加成员
// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember();
// saveMember.setMemberName(judgmentInfo.getJudgmentName());
// saveMember.setProjectId(tallProjectId);
// saveMember.setPhone(judgmentInfo.getJudgmentPhone());
// saveMember.setRoleId(Arrays.asList(roleId));
// saveMember.setToken(token);
// log.info("在tall内添加成员：{}", saveMember);
// JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
// log.info("添加成员后返回：{}", memberJsonResponse);
// //如果成员已存在，查询成员信息然后添加至角色内
// Long memberId = null;
// 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);
// 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)) {
// log.info("调用tall返回null");
// return;
// }
// if(jsonResponse.getCode() != 200){
// log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
// return;
// }
// }
// }
//
// //添加任务
// //查找场次信息表
// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId())
// .andSiteEqualTo((byte) siteJudgment.getSite());
// List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
// if (CollectionUtil.isNotEmpty(startOrderList)) {
// for (CompeteStartOrder startOrder : startOrderList) {
// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
// addTask.setProjectId(tallProjectId);
// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-"
// + startOrder.getSite() + "-" + jdgmentNum);
// addTask.setBeginTime(startOrder.getStartTime());
// addTask.setEndTime(startOrder.getEndTime());
// addTask.setExecutorId(roleId);
// addTask.setParentTaskId(startOrder.getTaskId());
// addTask.setToken(token);
// log.info("在tall内添加任务：{}", addTask);
// JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
// log.info("添加任务后返回：{}", normalTaskJsonResponse);
// if (ObjectUtil.isNull(normalTaskJsonResponse)) {
// log.info("调用tall返回null");
// return;
// }
// if(normalTaskJsonResponse.getCode() != 200){
// log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
// return;
// }
// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
// if (ObjectUtil.isNotNull(normalTask)) {
// //修改任务插件配置信息
// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig();
// updatePluginConfig.setWebPath("/home/osct/video-score");
// updatePluginConfig.setTaskId(normalTask.getDetailId());
// updatePluginConfig.setToken(token);
// log.info("修改tall内任务插件配置：{}", updatePluginConfig);
// JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
// if (ObjectUtil.isNull(pluginVoJsonResponse)) {
// log.info("调用tall返回null");
// return;
// }
// if(pluginVoJsonResponse.getCode() != 200){
// log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg());
// return;
// }
// }
// }
// }
// }
//添加角色
MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
saveRole.setProjectId(tallProjectId);
String jdgmentNum = "";
if (judgmentInfo.getJudgmentNum() == 0) {
jdgmentNum = "主裁判";
} else {
jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum();
}
saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum);
Long roleId = null;
saveRole.setToken(token);
log.info("在tall内添加角色：{}", saveRole);
JsonResponse<MemberVo.RoleInfo> roleJsonResponse = tallFeignClient.saveRole(saveRole);
log.info("添加角色后返回：{}", roleJsonResponse);
//失败return
if (ObjectUtil.isNull(roleJsonResponse)) {
log.info("调用tall返回null");
return;
}
if( roleJsonResponse.getCode() != 200) {
log.info("调用tall异常后返回：{}", roleJsonResponse.getMsg());
return;
}
MemberVo.RoleInfo roleInfo = roleJsonResponse.getData();
if (ObjectUtil.isNotNull(roleInfo)) {
roleId = roleInfo.getRoleId();
}
//添加成员
MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember();
saveMember.setMemberName(judgmentInfo.getJudgmentName());
saveMember.setProjectId(tallProjectId);
saveMember.setPhone(judgmentInfo.getJudgmentPhone());
saveMember.setRoleId(Arrays.asList(roleId));
saveMember.setToken(token);
log.info("在tall内添加成员：{}", saveMember);
JsonResponse<MemberVo.Member> memberJsonResponse = tallFeignClient.saveMember(saveMember);
log.info("添加成员后返回：{}", memberJsonResponse);
//如果成员已存在，查询成员信息然后添加至角色内
Long memberId = null;
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);
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)) {
log.info("调用tall返回null");
return;
}
if(jsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", jsonResponse.getMsg());
return;
}
}
}
//添加任务
//查找场次信息表
CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample();
startOrderExample.createCriteria().andProjectIdEqualTo(project.getId())
.andSiteEqualTo((byte) siteJudgment.getSite());
List<CompeteStartOrder> startOrderList = startOrderMapper.selectByExample(startOrderExample);
if (CollectionUtil.isNotEmpty(startOrderList)) {
for (CompeteStartOrder startOrder : startOrderList) {
TallTaskDto.AddTask addTask = new TallTaskDto.AddTask();
addTask.setProjectId(tallProjectId);
addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-"
+ startOrder.getSite() + "-" + jdgmentNum);
addTask.setBeginTime(startOrder.getStartTime());
addTask.setEndTime(startOrder.getEndTime());
addTask.setExecutorId(roleId);
addTask.setParentTaskId(startOrder.getTaskId());
addTask.setToken(token);
log.info("在tall内添加任务：{}", addTask);
JsonResponse<TaskVo.NormalTask> normalTaskJsonResponse = tallFeignClient.saveTask(addTask);
log.info("添加任务后返回：{}", normalTaskJsonResponse);
if (ObjectUtil.isNull(normalTaskJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(normalTaskJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", normalTaskJsonResponse.getMsg());
return;
}
if (ObjectUtil.isNotNull(normalTaskJsonResponse)) {
TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData();
if (ObjectUtil.isNotNull(normalTask)) {
//修改任务插件配置信息
TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig();
updatePluginConfig.setWebPath("/home/osct/video-score");
updatePluginConfig.setTaskId(normalTask.getDetailId());
updatePluginConfig.setToken(token);
log.info("修改tall内任务插件配置：{}", updatePluginConfig);
JsonResponse<TaskVo.PluginVo> pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig);
log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse);
if (ObjectUtil.isNull(pluginVoJsonResponse)) {
log.info("调用tall返回null");
return;
}
if(pluginVoJsonResponse.getCode() != 200){
log.info("调用tall异常后返回：{}", pluginVoJsonResponse.getMsg());
return;
}
}
}
}
}
//添加裁判
competeJudgment = new CompeteJudgment();
competeJudgment.setId(snowflake.nextId());

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

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

11
util/src/main/java/com/ccsens/util/PoiUtil.java
View File

@ -628,18 +628,23 @@ public class PoiUtil {
PoiUtilCell poiUtilCell = new PoiUtilCell();
poiUtilCell.setValue("111222333");
poiUtilCell.setColspan(1);
poiUtilCell.setColspan(2);
poiUtilCell.setRowspan(1);
PoiUtilCell poiUtilCell1 = new PoiUtilCell();
poiUtilCell1.setValue("1112222");
PoiUtilCell poiUtilCell3 = new PoiUtilCell();
poiUtilCell3.setValue("123");
poiUtilCell1.setValue("123");
PoiUtilCell poiUtilCell2 = new PoiUtilCell();
poiUtilCell2.setValue("");
poiUtilCell2.setFunction("SUM(A1:B1)");
poiUtilCell2.setFunction("SUM(A1:C1)");
List<PoiUtilCell> cells = new ArrayList<>();
cells.add(poiUtilCell);
cells.add(poiUtilCell1);
cells.add(poiUtilCell3);
cells.add(poiUtilCell2);
List<List<PoiUtilCell>> list = new ArrayList<>();

Write Preview
Loading…
Cancel
Save