From 0d49315e6a90d00bbbe1b6cca9f9a89a702ad5e5 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 10 Oct 2020 15:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/game/service/ScreenService.java | 12 ++-- .../java/com/ccsens/tall/bean/vo/TaskVo.java | 2 + .../tall/service/ProTaskDetailService.java | 61 ++----------------- tall/src/main/resources/application.yml | 4 +- 4 files changed, 15 insertions(+), 64 deletions(-) diff --git a/game/src/main/java/com/ccsens/game/service/ScreenService.java b/game/src/main/java/com/ccsens/game/service/ScreenService.java index b407301c..50591e68 100644 --- a/game/src/main/java/com/ccsens/game/service/ScreenService.java +++ b/game/src/main/java/com/ccsens/game/service/ScreenService.java @@ -207,15 +207,15 @@ public class ScreenService implements IScreenService { } } chromeMessageDto.setReceivers(messageUserList); -<<<<<<< HEAD - log.info("给所有成员发送开始游戏的消息：{}",chromeMessageDto.toString()); - messageService.sendGameMessageWithGetUrl(chromeMessageDto); - -======= +//<<<<<<< HEAD +// log.info("给所有成员发送开始游戏的消息：{}",chromeMessageDto.toString()); +// messageService.sendGameMessageWithGetUrl(chromeMessageDto); +// +//======= messageService.sendGameMessageWithGetUrl(chromeMessageDto,userIdSet); log.info("给所有成员发送消息：{}",chromeMessageDto); log.info("返回游戏信息：{}",urlVo); ->>>>>>> pt + return urlVo; } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index d6920221..cea8915e 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -451,6 +451,8 @@ public class TaskVo { private Long detailId; @ApiModelProperty("名称") private String name; + @ApiModelProperty("父任务名称") + private String parentName; @ApiModelProperty("详细描述") private String description; @ApiModelProperty("所属项目id") diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 255c800e..b1bfcba6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -1427,7 +1427,6 @@ public class ProTaskDetailService implements IProTaskDetailService { @Override public List queryAllTaskByProjectId(Long currentUserId, TaskDto.QueryAllTaskByProjectId projectIdDto) throws Exception { List taskList = new ArrayList<>(); -// TaskVo.TaskListByProjectId firstTask; //1、查找一级任务 SysProject project = sysProjectDao.selectByPrimaryKey(projectIdDto.getProjectId()); if (ObjectUtil.isNull(project)) { @@ -1441,65 +1440,15 @@ public class ProTaskDetailService implements IProTaskDetailService { firstTaskDetailList.forEach(firstTaskDetail -> { TaskVo.TaskListByProjectId firstTask = taskDetailDao.getTaskById(firstTaskDetail.getId()); List secondTaskList = taskDetailDao.getTaskByParentId(firstTaskDetail.getId()); + if(CollectionUtil.isNotEmpty(secondTaskList)){ + secondTaskList.forEach(secondTask -> { + secondTask.setParentName(firstTaskDetail.getName()); + }); + } firstTask.setSecondTasks(secondTaskList); taskList.add(firstTask); }); } -// int sequence = 1; -// for (ProTaskDetail firstTaskDetail : firstTaskDetailList) { -// TaskVo.TaskListByProjectId firstTask = new TaskVo.TaskListByProjectId(); -// BeanUtil.copyProperties(firstTaskDetail, firstTask); -// normalTask.setDetailId(firstTaskDetail.getId()); -// normalTask.setId(taskDeliverService.isTaskOrSubTime(firstTaskDetail.getId())); -// normalTask.setSequence(sequence); -// // 查询任务对应的配置 -// ProPluginConfigExample configExample = new ProPluginConfigExample(); -// configExample.createCriteria().andTaskIdEqualTo(firstTaskDetail.getId()).andPlaceLocationEqualTo((byte)0); -// List proPluginConfigs = proPluginConfigMapper.selectByExample(configExample); -// if (CollectionUtil.isNotEmpty(proPluginConfigs)) { -// ProPluginConfig config = proPluginConfigs.get(0); -// normalTask.setImportParam(config.getImportParam()); -// normalTask.setRoutineLocation(config.getRoutineLocation()); -// normalTask.setWebPath(config.getWebPath()); -// } -// //一级任务配置 -// normalTask.setProTaskConfig(getProTaskShow(normalTask.getDetailId())); -// -// //一级任务完成状态 -// ProSubTimeMember firstSubTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); -// if (ObjectUtil.isNotNull(firstSubTimeMember)) { -// normalTask.setRealEndTime(firstSubTimeMember.getRealFinishTime()); -// normalTask.setProcess(firstSubTimeMember.getComplatedStatus()); -// } -// //查找一级任务下的二级任务 -// List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectIdDto.getProjectId(), firstTaskDetail.getId(), project.getBeginTime(), project.getEndTime(),projectIdDto.getRoleId()); -// if (CollectionUtil.isNotEmpty(secondNormalTaskList)) { -// for (TaskVo.NormalTask task : secondNormalTaskList) { -// //处理插件 -// managePlugin(currentUserId,projectIdDto.getRoleId(),task,null); -// //二级任务完成状态 -// if(task.getProcess() != 2) { -// ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, task.getId()); -// if (ObjectUtil.isNotNull(subTimeMember)) { -// task.setRealEndTime(subTimeMember.getRealFinishTime()); -// task.setProcess(subTimeMember.getComplatedStatus()); -// }else if(task.getProcess() > 2){ -// task.setRealEndTime((long) 0); -// task.setProcess(0); -// } -// } -// //二级任务配置 -// task.setProTaskConfig(getProTaskShow(task.getDetailId())); -// //提醒信息 -// task.setRemindInfoList(proRemindDao.queryRemindByTask(normalTask.getId())); -// } -// } -// normalTask.setSecondTasks(secondNormalTaskList); -// normalTaskList.add(normalTask); -// sequence++; -// } -// } -// return normalTaskList; return taskList; } } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b2acd365..c88e995d 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common