|
|
@ -55,7 +55,7 @@ public class TaskService implements ITaskService{ |
|
|
|
byte visitor = 0; |
|
|
|
Long projectId = roleDao.findRoleOfProjectId(roleId); |
|
|
|
if (ObjectUtil.isNull(projectId)){ |
|
|
|
throw new BaseException("角色信息错误!"); |
|
|
|
throw new BaseException(CommonCodeError.ROLE_ERROR); |
|
|
|
} |
|
|
|
Long memberId = memberDao.findUserOfMemberId(projectId,userId); |
|
|
|
//不是项目成员则为游客
|
|
|
@ -121,10 +121,10 @@ public class TaskService implements ITaskService{ |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<TaskVo.QueryTask> queryPermanentGlobalTask(TaskDto.QueryPermanentGlobalTask param, Long userId) { |
|
|
|
//查找角色权限
|
|
|
|
//查找当前角色是否有查看权限
|
|
|
|
Boolean isLook = queryRoleIsLook(param.getRoleId(),userId); |
|
|
|
if (BooleanUtil.isFalse(isLook)){ |
|
|
|
throw new BaseException("没有查看权限!"); |
|
|
|
throw new BaseException(CommonCodeError.NOT_PERMISSION); |
|
|
|
} |
|
|
|
List<TaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(param.getRoleId()); |
|
|
|
//查找项目面板和插件信息
|
|
|
@ -135,10 +135,10 @@ public class TaskService implements ITaskService{ |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<TaskVo.QueryTask> queryGlobalTask(TaskDto.QueryGlobalTask param, Long userId) { |
|
|
|
//查找角色权限
|
|
|
|
//查找当前角色是否有查看权限
|
|
|
|
Boolean isLook = queryRoleIsLook(param.getRoleId(),userId); |
|
|
|
if (BooleanUtil.isFalse(isLook)){ |
|
|
|
throw new BaseException("没有查看权限!"); |
|
|
|
throw new BaseException(CommonCodeError.NOT_PERMISSION); |
|
|
|
} |
|
|
|
List<TaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(param.getRoleId(),param.getTimeNode(),param.getTimeUnit()); |
|
|
|
queryPluginForTask(globalTask); |
|
|
@ -157,10 +157,10 @@ public class TaskService implements ITaskService{ |
|
|
|
}else{ |
|
|
|
query +="interval "+(param.getQueryNum()-1)+" "+unit; |
|
|
|
} |
|
|
|
//查找角色权限
|
|
|
|
//查找当前角色是否有查看权限
|
|
|
|
Boolean isLook = queryRoleIsLook(param.getRoleId(),userId); |
|
|
|
if (BooleanUtil.isFalse(isLook)){ |
|
|
|
throw new BaseException("没有查看权限!"); |
|
|
|
throw new BaseException(CommonCodeError.NOT_PERMISSION); |
|
|
|
} |
|
|
|
//TODO 季度未实现
|
|
|
|
List<TaskVo.QueryTask> regularTask = taskDetailDao.queryRegularTask(param.getRoleId(),param.getTimeUnit(),param.getTimeNode(),param.getQueryType(),query,timeFormat); |
|
|
|