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

0318.1

master
zhangye 6 years ago
parent
7bba7cb56d
commit
216e139f40
3 changed files with 88 additions and 9 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. 8
      health/src/main/java/com/ccsens/health/service/JourneyService.java
  2. 23
      tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
  3. 66
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

8
health/src/main/java/com/ccsens/health/service/JourneyService.java
View File

@ -3,6 +3,7 @@ package com.ccsens.health.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake; import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.ccsens.cloudutil.feign.TallFeignClient; import com.ccsens.cloudutil.feign.TallFeignClient;
import com.ccsens.health.bean.dto.JourneyDto; import com.ccsens.health.bean.dto.JourneyDto;
@ -110,6 +111,7 @@ public class JourneyService implements IJourneyService{
*/ */
@Override @Override
public List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(QueryDto<JourneyDto.SelectAbnormalJourney> params) { public List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(QueryDto<JourneyDto.SelectAbnormalJourney> params) {
return null; return null;
} }
@ -129,5 +131,11 @@ public class JourneyService implements IJourneyService{
@Override @Override
public void deleteAbnormalJourney(QueryDto<JourneyDto.DeleteAbnormalJourney> params) { public void deleteAbnormalJourney(QueryDto<JourneyDto.DeleteAbnormalJourney> params) {
JourneyAbnormal journeyAbnormal = journeyAbnormalDao.selectByPrimaryKey(params.getParam().getId()); JourneyAbnormal journeyAbnormal = journeyAbnormalDao.selectByPrimaryKey(params.getParam().getId());
if(ObjectUtil.isNull(journeyAbnormal)){
throw new BaseException(CodeEnum.PARAM_ERROR);
}
journeyAbnormal.setRecStatus((byte) 2);
journeyAbnormalDao.updateByPrimaryKeySelective(journeyAbnormal);
} }
} }

23
tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
View File

@ -21,6 +21,8 @@ public class TaskVo {
private List<GlobalTask> globalTaskList; private List<GlobalTask> globalTaskList;
@ApiModelProperty("普通任务") @ApiModelProperty("普通任务")
private List<NormalTask> normalTaskList; private List<NormalTask> normalTaskList;
@ApiModelProperty("显示的配置")
private ProShow proShow;
@ApiModelProperty("分页信息") @ApiModelProperty("分页信息")
private PageInfo pageInfo; private PageInfo pageInfo;
} }
@ -98,6 +100,8 @@ public class TaskVo {
private String showTimeFormat; private String showTimeFormat;
@ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示") @ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示")
private int showShortcuts; private int showShortcuts;
@ApiModelProperty("是否展示添加任务的按钮 0不展示 1展示")
private int createTask;
@ApiModelProperty("循环周期") @ApiModelProperty("循环周期")
private String cycle; private String cycle;
@ApiModelProperty("跳转模式 0自动，1延迟,2手动") @ApiModelProperty("跳转模式 0自动，1延迟,2手动")
@ -152,6 +156,25 @@ public class TaskVo {
} }
@ApiModel
@Data
public static class ProShow{
@ApiModelProperty("上下滑动类型 0:上下滑动 1：只支持向下滑 2：只支持上滑 4：上下都不滑动")
private int slide;
@ApiModelProperty("过滤器显示 0：都显示 1：都不显示 2.只展示时间轴/清单")
private int filter;
@ApiModelProperty("开始时间显示样式（默认 MM-dd HH:mm) 为空时不展示时间")
private String showTimeFormat;
@ApiModelProperty("时长展示单位 0：根据时长转换成对应分钟或小时 1：不展示 2：转化成分钟 3：转化成小时")
private int duration;
@ApiModelProperty("是否展示mvp 0不展示 1展示")
private int isShowMvp;
@ApiModelProperty("是否显示新建任务按钮 0不展示 1展示")
private int createTask;
@ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示")
private int showShortcuts;
}
@ApiModel @ApiModel
@Data @Data

66
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
View File

@ -108,13 +108,44 @@ public class ProTaskDetailService implements IProTaskDetailService {
return obj; return obj;
} }
/**
* 获取项目里的任务展示配置
*/
private TaskVo.ProShow getProShow(Long projectId)throws Exception{
TaskVo.ProShow proShowInfo = new TaskVo.ProShow();
ProShow proShow = proShowService.selectByProjectId(projectId);
if(ObjectUtil.isNotNull(proShow)){
proShowInfo.setSlide(proShow.getSlide());
proShowInfo.setFilter(proShow.getFilter());
proShowInfo.setIsShowMvp(proShow.getIsShowMvp());
proShowInfo.setCreateTask(proShow.getCreateTask());
proShowInfo.setDuration(proShow.getDuration());
proShowInfo.setShowTimeFormat(proShow.getTimeShow());
proShowInfo.setShowShortcuts(proShow.getShowShortcuts());
if(proShow.getDuration() == 1) {
proShowInfo.setShowTimeFormat(null);
}
}else {
proShowInfo.setSlide(0);
proShowInfo.setFilter(0);
proShowInfo.setIsShowMvp(1);
proShowInfo.setCreateTask(1);
proShowInfo.setDuration(0);
proShowInfo.setShowTimeFormat("MM-dd HH:mm");
proShowInfo.setShowShortcuts(1);
}
return proShowInfo;
}
/** /**
* 查看任务 项目经理 * 查看任务 项目经理
*/ */
private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long currentUserId, Long projectId,Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long currentUserId, Long projectId,Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception {
ProShow proShow = proShowService.selectByProjectId(projectId); //任务展示的配置
// ProShow proShow = proShowService.selectByProjectId(projectId);
TaskVo.ProShow proShow = getProShow(projectId);
TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo();
proTaskInfo.setProShow(proShow);
List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>(); List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
List<TaskVo.NormalTask> normalTaskList = new ArrayList<>(); List<TaskVo.NormalTask> normalTaskList = new ArrayList<>();
TaskVo.GlobalTask globalTask = null; TaskVo.GlobalTask globalTask = null;
@ -148,13 +179,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
//一级任务的配置 //一级任务的配置
if(ObjectUtil.isNotNull(proShow)){ if(ObjectUtil.isNotNull(proShow)){
normalTask.setShowShortcuts(proShow.getShowShortcuts()); normalTask.setShowShortcuts(proShow.getShowShortcuts());
normalTask.setShowTimeFormat(proShow.getTimeShow()); normalTask.setCreateTask(proShow.getCreateTask());
normalTask.setShowTimeFormat(proShow.getShowTimeFormat());
if(proShow.getDuration() == 1){ if(proShow.getDuration() == 1){
normalTask.setDuration(null); normalTask.setDuration(null);
normalTask.setShowTimeFormat(null);
} }
}else { }else {
normalTask.setShowTimeFormat("MM-dd HH:mm"); normalTask.setShowTimeFormat("MM-dd HH:mm");
normalTask.setShowShortcuts(1); normalTask.setShowShortcuts(1);
normalTask.setCreateTask(1);
} }
//一级任务完成状态 //一级任务完成状态
@ -182,13 +216,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
if(ObjectUtil.isNotNull(proShow)){ if(ObjectUtil.isNotNull(proShow)){
task.setShowShortcuts(proShow.getShowShortcuts()); task.setShowShortcuts(proShow.getShowShortcuts());
task.setShowTimeFormat(proShow.getTimeShow()); task.setCreateTask(proShow.getCreateTask());
task.setShowTimeFormat(proShow.getShowTimeFormat());
if(proShow.getDuration() == 1){ if(proShow.getDuration() == 1){
task.setDuration(null); task.setDuration(null);
task.setShowTimeFormat(null);
} }
}else { }else {
task.setShowTimeFormat("MM-dd HH:mm"); task.setShowTimeFormat("MM-dd HH:mm");
task.setShowShortcuts(1); task.setShowShortcuts(1);
task.setCreateTask(1);
} }
} }
TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList, startTime, endTime, process); TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList, startTime, endTime, process);
@ -224,9 +261,11 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 查看任务 项目成员 * 查看任务 项目成员
*/ */
private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception {
ProShow proShow = proShowService.selectByProjectId(projectId); // ProShow proShow = proShowService.selectByProjectId(projectId);
TaskVo.ProShow proShow = getProShow(projectId);
TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo();
proTaskInfo.setProShow(proShow);
List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>(); List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
List<TaskVo.NormalTask> normalTaskList = new ArrayList<>(); List<TaskVo.NormalTask> normalTaskList = new ArrayList<>();
TaskVo.GlobalTask globalTask = null; TaskVo.GlobalTask globalTask = null;
@ -260,13 +299,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
if(ObjectUtil.isNotNull(proShow)){ if(ObjectUtil.isNotNull(proShow)){
normalTask.setShowShortcuts(proShow.getShowShortcuts()); normalTask.setShowShortcuts(proShow.getShowShortcuts());
normalTask.setShowTimeFormat(proShow.getTimeShow()); normalTask.setCreateTask(proShow.getCreateTask());
normalTask.setShowTimeFormat(proShow.getShowTimeFormat());
if(proShow.getDuration() == 1){ if(proShow.getDuration() == 1){
normalTask.setDuration(null); normalTask.setDuration(null);
normalTask.setShowTimeFormat(null);
} }
}else { }else {
normalTask.setShowTimeFormat("MM-dd HH:mm"); normalTask.setShowTimeFormat("MM-dd HH:mm");
normalTask.setShowShortcuts(1); normalTask.setShowShortcuts(1);
normalTask.setCreateTask(1);
} }
} }
TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process); TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process);
@ -514,8 +556,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
*/ */
@Override @Override
public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception { public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception {
ProShow proShow = proShowService.selectByProjectId(projectId); // ProShow proShow = proShowService.selectByProjectId(projectId);
TaskVo.ProShow proShow = getProShow(projectId);
ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId); ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId);
TaskVo.NormalTask taskDetail = null; TaskVo.NormalTask taskDetail = null;
@ -534,13 +576,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
//显示的日期格式和时长格式 //显示的日期格式和时长格式
if (ObjectUtil.isNotNull(proShow)) { if (ObjectUtil.isNotNull(proShow)) {
taskDetail.setShowShortcuts(proShow.getShowShortcuts()); taskDetail.setShowShortcuts(proShow.getShowShortcuts());
taskDetail.setShowTimeFormat(proShow.getTimeShow()); taskDetail.setCreateTask(proShow.getCreateTask());
taskDetail.setShowTimeFormat(proShow.getShowTimeFormat());
if (proShow.getDuration() == 1) { if (proShow.getDuration() == 1) {
taskDetail.setDuration(null); taskDetail.setDuration(null);
taskDetail.setShowTimeFormat(null);
} }
} else { } else {
taskDetail.setShowTimeFormat("MM-dd HH:mm"); taskDetail.setShowTimeFormat("MM-dd HH:mm");
taskDetail.setShowShortcuts(1); taskDetail.setShowShortcuts(1);
taskDetail.setCreateTask(1);
} }
//添加项目信息和插件信息 //添加项目信息和插件信息
normalTaskAddPlugin(currentUserId, subTime.getTaskDetailId(), taskDetail); normalTaskAddPlugin(currentUserId, subTime.getTaskDetailId(), taskDetail);
@ -568,13 +613,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
//显示的日期格式和时长格式 //显示的日期格式和时长格式
if(ObjectUtil.isNotNull(proShow)){ if(ObjectUtil.isNotNull(proShow)){
groupTask.setShowShortcuts(proShow.getShowShortcuts()); groupTask.setShowShortcuts(proShow.getShowShortcuts());
groupTask.setShowTimeFormat(proShow.getTimeShow()); groupTask.setCreateTask(proShow.getCreateTask());
groupTask.setShowTimeFormat(proShow.getShowTimeFormat());
if(proShow.getDuration() == 1){ if(proShow.getDuration() == 1){
groupTask.setDuration(null); groupTask.setDuration(null);
groupTask.setShowTimeFormat(null);
} }
}else { }else {
groupTask.setShowTimeFormat("MM-dd HH:mm"); groupTask.setShowTimeFormat("MM-dd HH:mm");
groupTask.setShowShortcuts(1); groupTask.setShowShortcuts(1);
groupTask.setCreateTask(1);
} }
//添加项目信息和插件信息 //添加项目信息和插件信息
normalTaskAddPlugin(currentUserId, groupTask.getDetailId(), groupTask); normalTaskAddPlugin(currentUserId, groupTask.getDetailId(), groupTask);

Write Preview
Loading…
Cancel
Save