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

Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

tall3
zy_Java 4 years ago
parent
1ac2743790 70e00d2b67
commit
7a88c2515f
5 changed files with 187 additions and 211 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. 4
      common/src/main/java/com/ccsens/common/bean/vo/TaskVo.java
  2. 287
      common/src/main/java/com/ccsens/common/service/ProRoleService.java
  3. 99
      common/src/main/java/com/ccsens/common/service/TaskService.java
  4. 2
      common/src/main/java/com/ccsens/common/util/CommonCodeError.java
  5. 6
      common/src/main/resources/mapper_dao/ProTaskDetailDao.xml

4
common/src/main/java/com/ccsens/common/bean/vo/TaskVo.java
View File

@ -65,9 +65,9 @@ public class TaskVo {
@ApiModel("任务下的插件信息")
public static class TaskPluginInfo{
@ApiModelProperty("插件id")
private int pluginId;
private Long pluginId;
@ApiModelProperty("参数")
private int param;
private String param;
@ApiModelProperty("行")
private int row;
@ApiModelProperty("列")

287
common/src/main/java/com/ccsens/common/service/ProRoleService.java
View File

@ -1,5 +1,6 @@
package com.ccsens.common.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -56,6 +57,7 @@ public class ProRoleService implements IProRoleService {
RoleVo.RoleInfo RoleInfo = new RoleVo.RoleInfo();
//不显示的角色
List<RoleVo.RoleInfo> invisibleList = new ArrayList<>();
List<RoleVo.RoleInfo> invisibleList1 = new ArrayList<>();
//查询当前用户所属的角色的list
List<Long> roleIds = new ArrayList<>();
//对自己不可见的角色的list
@ -69,12 +71,12 @@ public class ProRoleService implements IProRoleService {
List<ProRole> proRoles = new ArrayList<>();
//排序后的
List<ProRole> proRoles1 = new ArrayList<>();
if (proMembers.size()!=0) {
if (CollectionUtil.isNotEmpty(proMembers)) {
//判断用户是成员是不是有角色 通过成员id来判断
ProRoleMemberExample proRoleMemberExample = new ProRoleMemberExample();
proRoleMemberExample.createCriteria().andMemberIdEqualTo(proMembers.get(0).getId());
List<ProRoleMember> proRoleMembers = proRoleMemberMapper.selectByExample(proRoleMemberExample);
if (ObjectUtil.isNotNull(proRoleMembers)) {
if (CollectionUtil.isNotEmpty(proRoleMembers)) {
//用户不是关注者 否 不是才是关注者
//用户有角色 角色是那个 查询当前用户所属的角色
Long roleId1 = 0L;
@ -83,7 +85,7 @@ public class ProRoleService implements IProRoleService {
Long roleId = proRoleMember.getRoleId();//查询当前用户所属的角色 后端 前端
roleIds.add(roleId);
ProRoleRepulsionExample proRoleRepulsionExample = new ProRoleRepulsionExample();
proRoleRepulsionExample.createCriteria().andRoleIdEqualTo(roleId);
proRoleRepulsionExample.createCriteria().andRepulsionRoleIdEqualTo(roleId);
List<ProRoleRepulsion> proRoleRepulsions = proRoleRepulsionMapper.selectByExample(proRoleRepulsionExample);
for (ProRoleRepulsion proRoleRepulsion : proRoleRepulsions) {
roleId1 = proRoleRepulsion.getRoleId();//对自己不可见的角色
@ -110,7 +112,6 @@ public class ProRoleService implements IProRoleService {
}
}
}
//进行排序 把项目经理拿出来
Iterator<ProRole> iterator5 = proRoles.iterator();
while (iterator5.hasNext()) {
@ -121,7 +122,6 @@ public class ProRoleService implements IProRoleService {
iterator5.remove(); //把项目经理角色拿出去
}
}
/*for (int i = 0; i < proRoles.size(); i++) {
String PM = labelDao.queryIsPm(proRoles.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是项目经理
@ -162,228 +162,155 @@ public class ProRoleService implements IProRoleService {
proRoles1.add(proRoles.get(i));
}
}else{ //用户是游客 是 查询所有 未设置对谁不可见信息 的角色 通过角色id去查找 role_id
ProRoleExample proRoleExample = new ProRoleExample();
proRoleExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
proRoles = proRoleMapper.selectByExample(proRoleExample);
if (ObjectUtil.isNotNull(proRoles)) {
Iterator<ProRole> iterator = proRoles.iterator();
while (iterator.hasNext()) {
ProRole proRole = iterator.next();
//查看是否设置不可见
ProRoleRepulsionExample proRoleRepulsionExample = new ProRoleRepulsionExample();
proRoleRepulsionExample.createCriteria().andRepulsionRoleIdEqualTo(proRole.getId());
List<ProRoleRepulsion> proRoleRepulsions = proRoleRepulsionMapper.selectByExample(proRoleRepulsionExample);
if (proRoleRepulsions.size()!=0) {
//查到就是设置过了 移除
iterator.remove();
}
}
Iterator<ProRole> iterator1 = proRoles.iterator();
while (iterator1.hasNext()) {
ProRole proRole = iterator1.next();
String PM = labelDao.queryIsPm(proRole.getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是项目经理
proRoles1.add(proRole);
iterator1.remove(); //把项目经理角色拿出去
}
}
//进行排序 把我的角色拿出来 本来就没有我的角色 不需要判断
//进行排序 把其他角色拿出来
for (int i = 0; i < proRoles.size(); i++) {
proRoles1.add(proRoles.get(i));
}
}
}
} else { //用户是游客 是 查询所有 未设置对谁不可见信息 的角色 通过角色id去查找 role_id
ProRoleExample proRoleExample = new ProRoleExample();
proRoleExample.createCriteria().andProjectIdEqualTo(param.getProjectId());
proRoles = proRoleMapper.selectByExample(proRoleExample);
if (ObjectUtil.isNotNull(proRoles)) {
/*for (ProRole proRole : proRoles) {
ProRoleRepulsionExample proRoleRepulsionExample = new ProRoleRepulsionExample();
proRoleRepulsionExample.createCriteria().andRoleIdEqualTo(proRole.getId());
List<ProRoleRepulsion> proRoleRepulsions = proRoleRepulsionMapper.selectByExample(proRoleRepulsionExample);
if (ObjectUtil.isNotNull(proRoleRepulsions)) {
//查到就是设置过了 移除
proRoles.remove(proRole);
}
}*/
Iterator<ProRole> iterator = proRoles.iterator();
while (iterator.hasNext()) {
ProRole proRole = iterator.next();
//查看是否设置不可见
ProRoleRepulsionExample proRoleRepulsionExample = new ProRoleRepulsionExample();
proRoleRepulsionExample.createCriteria().andRoleIdEqualTo(proRole.getId());
proRoleRepulsionExample.createCriteria().andRepulsionRoleIdEqualTo(proRole.getId());
List<ProRoleRepulsion> proRoleRepulsions = proRoleRepulsionMapper.selectByExample(proRoleRepulsionExample);
if (proRoleRepulsions.size()!=0) {
//查到就是设置过了 移除
iterator.remove();
}
}
//进行排序 把项目经理拿出来
/*for (int i = 0; i < proRoles.size(); i++) {
String PM = labelDao.queryIsPm(proRoles.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是项目经理
ProRole proRole = proRoles.get(i);
proRoles1.add(proRole);
proRoles.remove(proRole); //把项目经理角色拿出去
}
}*/
Iterator<ProRole> iterator1 = proRoles.iterator();
while (iterator1.hasNext()) {
ProRole proRole = iterator1.next();
String PM = labelDao.queryIsPm(proRole.getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是项目经理
proRoles1.add(proRole);
proRoles.remove(proRole); //把项目经理角色拿出去
iterator1.remove(); //把项目经理角色拿出去
}
}
//进行排序 把我的角色拿出来 本来就没有我的角色 不需要判断
/*for (int i = 0; i < proRoles.size(); i++) {
//是否是mine 判断是不是自己的角色// 0否 1是
if(!roleIds.isEmpty()){
for (Long roleId : roleIds) {
Long id = proRoles.get(i).getId();
if (roleId.equals(id)) {
proRoles1.add(proRoles.get(i));
proRoles.remove(proRoles.get(i)); //把我的角色拿出去
}
}
}
}*/
/*for (int i = 0; i < proRoles.size(); i++) {
//是否是mine 判断是不是自己的角色// 0否 1是
if(!roleIds.isEmpty()){
Iterator<Long> iterator2 = roleIds.iterator();
while (iterator2.hasNext()) {
Long roleId = iterator2.next();
Long id = proRoles.get(i).getId();
if (roleId.equals(id)) {
proRoles1.add(proRoles.get(i));
proRoles.remove(proRoles.get(i)); //把我的角色拿出去
}
}
}
}*/
//进行排序 把其他角色拿出来
for (int i = 0; i < proRoles.size(); i++) {
proRoles1.add(proRoles.get(i));
}
}
}
//根据项目id和userId查询当前用户配置的角色栏信息
ProRoleShowExample proRoleShowExample = new ProRoleShowExample();
proRoleShowExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andUserIdEqualTo(userId);
List<ProRoleShow> proRoleShows = proRoleShowMapper.selectByExample(proRoleShowExample);
//循环所有的角色，判断是否在配置信息内 将角色信息放入“显示角色”的数组内 将角色放入“隐藏角色"数组
if (proRoleShows.size()!=0) {
for (int i = 0; i < proRoles1.size(); i++) {
for (ProRoleShow proRoleShow : proRoleShows) {
Long roleId = proRoleShow.getRoleId(); //配置信息的id
Long id = proRoles1.get(i).getId(); //项目下的角色
if(roleId.equals(id)){ //一样就是配置过
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm 0否 1 是 //通过标签来定义 5 和 2 34是
//通过角色表里面的标签id 去 标签表查询 label_type_id =5 在去标签类型表查5 和 level =2
String PM = labelDao.queryIsPm(proRoles1.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是
RoleInfo1.setPm(1L);
} else {
RoleInfo1.setPm(0L);
}
//是否是mine 判断是不是自己的角色// 0否 1是
if(roleIds.size()!=0){
for (Long roleId1 : roleIds) {
Long id1 = proRoles1.get(i).getId();
if (roleId1.equals(id1)) {
RoleInfo1.setMine(1L);
} else {
RoleInfo1.setMine(0L);
}
}
}else {
RoleInfo1.setMine(0L);
}
//排序
RoleInfo1.setSequence(Long.valueOf(proRoleShow.getSequence()));
visibleList.add(RoleInfo1);
}else{
//未配置过了
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm
String PM = labelDao.queryIsPm(proRoles1.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是
RoleInfo1.setPm(1L);
} else {
RoleInfo1.setPm(0L);
}
/*//是否是mine 判断是不是自己的角色// 0否 1是
for (Long roleId1 : roleIds) {
Long id1 = proRoles1.get(i).getId();
if (roleId1.equals(id1)) {
RoleInfo1.setMine(1L);
} else {
RoleInfo1.setMine(0L);
}
}*/
//是否是mine 判断是不是自己的角色// 0否 1是
if(roleIds.size()!=0){
for (Long roleId1 : roleIds) {
Long id1 = proRoles1.get(i).getId();
if (roleId1.equals(id1)) {
RoleInfo1.setMine(1L);
} else {
RoleInfo1.setMine(0L);
}
}
}else {
RoleInfo1.setMine(0L);
}
//排序
RoleInfo1.setSequence((long) i+1);
invisibleList.add(RoleInfo1);
if (proRoleShows.size()!=0) { //配置过的
//通过
Iterator<ProRole> iterator = proRoles1.iterator();
while (iterator.hasNext()) {
ProRole proRole = iterator.next();
//用户下的角色id 去除 proRoleShows下的
Long id = proRole.getId();
for (int i = 0; i < proRoleShows.size(); i++) {
Long roleId = proRoleShows.get(i).getRoleId();
if(id.equals(roleId)){
iterator.remove();
}
}
/*ProRoleShowExample proRoleShowExample1 = new ProRoleShowExample();
proRoleShowExample.createCriteria().andRoleIdEqualTo(proRoles1.get(i).getId()).andProjectIdEqualTo(param.getProjectId()).andUserIdEqualTo(userId);
List<ProRoleShow> proRoleShows1 = proRoleShowMapper.selectByExample(proRoleShowExample1);*/
/*if (ObjectUtil.isNotNull(proRoleShows1)) {
//配置过了 将角色信总放入“显示角色"的数组内
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm 0否 1 是 //通过标签来定义 5 和 2 34是
//通过角色表里面的标签id 去 标签表查询 label_type_id =5 在去标签类型表查5 和 level =2
String PM = labelDao.queryIsPm(proRoles1.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是
RoleInfo.setPm(1L);
} else {
RoleInfo.setPm(0L);
}
//是否是mine 判断是不是自己的角色// 0否 1是
for (Long roleId : roleIds) {
Long id = proRoles1.get(i).getId();
if (roleId.equals(id)) {
}
//proRoles1里面就是没有设置过的
for (int i = 0; i < proRoles1.size(); i++) {
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm
String PM = labelDao.queryIsPm(proRoles1.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是
RoleInfo1.setPm(1L);
} else {
RoleInfo1.setPm(0L);
}
//是否是mine 判断是不是自己的角色// 0否 1是
if(roleIds.size()!=0){
for (Long roleId1 : roleIds) {
Long id1 = proRoles1.get(i).getId();
if (roleId1.equals(id1)) {
RoleInfo1.setMine(1L);
} else {
RoleInfo1.setMine(0L);
}
}
//排序
RoleInfo1.setSequence(Long.valueOf(proRoleShows1.get(0).getSequence()));
visibleList.add(RoleInfo1);
}else {
RoleInfo1.setMine(0L);
}
//排序
RoleInfo1.setSequence((long) i+1);
invisibleList.add(RoleInfo1);
}
//proRoleShows里面就是设置过的
for (ProRoleShow proRoleShow : proRoleShows) {
ProRoleExample proRoleExample = new ProRoleExample();
proRoleExample.createCriteria().andIdEqualTo(proRoleShow.getRoleId());
List<ProRole> proRoles2 = proRoleMapper.selectByExample(proRoleExample);
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
RoleInfo1.setId(proRoles2.get(0).getId());
RoleInfo1.setName(proRoles2.get(0).getName());
//是否是pm 0否 1 是 //通过标签来定义 5 和 2 34是
//通过角色表里面的标签id 去 标签表查询 label_type_id =5 在去标签类型表查5 和 level =2
String PM = labelDao.queryIsPm(proRoles2.get(0).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是
RoleInfo1.setPm(1L);
} else {
//未配置过了
RoleInfo.setId(proRoles1.get(i).getId());
RoleInfo.setName(proRoles1.get(i).getName());
//是否是pm
String PM = labelDao.queryIsPm(proRoles1.get(i).getLabelId());
if (StrUtil.isNotEmpty(PM)) { //是
RoleInfo.setPm(1L);
} else {
RoleInfo.setPm(0L);
}
//是否是mine 判断是不是自己的角色// 0否 1是
for (Long roleId : roleIds) {
Long id = proRoles1.get(i).getId();
if (roleId.equals(id)) {
RoleInfo.setMine(1L);
RoleInfo1.setPm(0L);
}
//是否是mine 判断是不是自己的角色// 0否 1是
if(roleIds.size()!=0){
for (Long roleId1 : roleIds) {
Long id1 = proRoles2.get(0).getId();
if (roleId1.equals(id1)) {
RoleInfo1.setMine(1L);
} else {
RoleInfo.setMine(0L);
RoleInfo1.setMine(0L);
}
}
//排序
RoleInfo.setSequence((long) i);
invisibleList.add(RoleInfo);
}*/
}else {
RoleInfo1.setMine(0L);
}
//排序
RoleInfo1.setSequence(Long.valueOf(proRoleShow.getSequence()));
visibleList.add(RoleInfo1);
}
} else {
//循环查询到的角色，放入“显示角色”的数组内 数组长度大于等于5
@ -413,7 +340,6 @@ public class ProRoleService implements IProRoleService {
}else {
RoleInfo1.setMine(0L);
}
//排序
RoleInfo1.setSequence((long) i+1);
visibleList.add(RoleInfo1);
@ -421,7 +347,6 @@ public class ProRoleService implements IProRoleService {
}
if (proRoles1.size() >= 6) {
for (int i = 0; i < 5; i++) {
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());

99
common/src/main/java/com/ccsens/common/service/TaskService.java
View File

@ -56,7 +56,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);
//不是项目成员则为游客
@ -90,42 +90,90 @@ public class TaskService implements ITaskService{
*/
public void queryPluginForTask(List<TaskVo.QueryTask> taskList){
if (CollectionUtil.isNotEmpty(taskList)){
List<List<TaskVo.TaskPluginInfo>> plugins = new ArrayList<>();
for (TaskVo.QueryTask queryTask : taskList) {
List<List<TaskVo.TaskPluginInfo>> plugins = new ArrayList<>();
//如果任务面板信息不为空,则根据任务面板的行/列创建二维数组
if (ObjectUtil.isNotNull(queryTask.getPanel())){
int panelRow = queryTask.getPanel().getRow();
int panelCol = queryTask.getPanel().getCol();
//创建任务面板的二维数组
for (int i = 0; i < panelRow; i++) {
List<TaskVo.TaskPluginInfo> pluginInfoList = new ArrayList<>();
for (int j = 0; j < panelCol; j++) {
pluginInfoList.add(null);
}
plugins.add(pluginInfoList);
}
//将插件放入二维数组对应的位置中
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(queryTask.getDetailId());
for (TaskVo.TaskPluginInfo taskPlugin : taskPluginInfoList) {
int pluginCol = taskPlugin.getCol();
int pluginRow = taskPlugin.getRow();
plugins.get(pluginRow - 1).set(pluginCol-1,taskPlugin);
if (0 != panelRow && 0 != panelCol){
//创建任务面板的二维数组
createSecondPanel(plugins,panelRow,panelCol);
//将插件放入二维数组对应的位置中
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(queryTask.getDetailId());
putDateInList(taskPluginInfoList,plugins,queryTask);
}else{
//根据插件最大的行和列创建二维数组
createPanelByPlugin(queryTask.getDetailId(),plugins,queryTask);
}
}else {
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(queryTask.getDetailId());
plugins.add(taskPluginInfoList);
//根据插件最大的行和列创建二维数组
createPanelByPlugin(queryTask.getDetailId(),plugins,queryTask);
}
queryTask.setPlugins(plugins);
}
}
}
/**
* 根据插件的最大行列创建面板
* @param taskDetailId 任务详情id
* @param plugins 插件列表
* @param queryTask 任务
*/
public void createPanelByPlugin(Long taskDetailId,List<List<TaskVo.TaskPluginInfo>> plugins,TaskVo.QueryTask queryTask){
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(taskDetailId);
if (CollectionUtil.isNotEmpty(taskPluginInfoList)){
List<Integer> col = taskPluginInfoList.stream().map(TaskVo.TaskPluginInfo::getCol).collect(Collectors.toList());
List<Integer> row = taskPluginInfoList.stream().map(TaskVo.TaskPluginInfo::getRow).collect(Collectors.toList());
Integer newCol = Collections.max(col);
Integer newRow = Collections.max(row);
//创建任务面板的二维数组
createSecondPanel(plugins,newRow,newCol);
//将插件放入二维数组对应的位置中
putDateInList(taskPluginInfoList,plugins,queryTask);
}
}
/**
* 创建面板
* @param plugins 插件列表
* @param row 行
* @param col 列
*/
public void createSecondPanel(List<List<TaskVo.TaskPluginInfo>> plugins,int row,int col){
for (int i = 0; i < row; i++) {
List<TaskVo.TaskPluginInfo> pluginInfoList = new ArrayList<>();
for (int j = 0; j < col; j++) {
pluginInfoList.add(null);
}
plugins.add(pluginInfoList);
}
}
/**
* 向空面板里插入插件详情
* @param taskPluginInfoList 插件详情列表
* @param plugins 插件列表
* @param queryTask 任务
*/
public void putDateInList(List<TaskVo.TaskPluginInfo> taskPluginInfoList,List<List<TaskVo.TaskPluginInfo>> plugins,TaskVo.QueryTask queryTask){
for (TaskVo.TaskPluginInfo taskPlugin : taskPluginInfoList) {
int pluginCol = taskPlugin.getCol();
int pluginRow = taskPlugin.getRow();
if (0 == pluginCol || 0 == pluginRow) {
continue;
}
plugins.get(pluginRow - 1).set(pluginCol - 1, taskPlugin);
}
queryTask.setPlugins(plugins);
}
@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());
//查找项目面板和插件信息
@ -136,10 +184,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);
@ -158,10 +206,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);
@ -187,6 +235,7 @@ public class TaskService implements ITaskService{
queryPluginForTask(replenishTask);
return replenishTask;
}
queryPluginForTask(regularTask);
return regularTask;
}

2
common/src/main/java/com/ccsens/common/util/CommonCodeError.java
View File

@ -9,5 +9,7 @@ public class CommonCodeError extends CodeError {
public static final Code TASK_VITAL_LABEL_ERROR = new Code(1,"任务标签异常", true);
public static final Code NOT_TASK = new Code(2,"未找到对应任务", true);
public static final Code NOT_PERMISSION = new Code(3,"没有权限!", true);
public static final Code ROLE_ERROR = new Code(4,"角色信息错误!", true);
}

6
common/src/main/resources/mapper_dao/ProTaskDetailDao.xml
View File

@ -66,7 +66,7 @@
AND rt.role_id = #{roleId}
</select>
<select id="queryGlobalTask" resultType="com.ccsens.common.bean.vo.TaskVo$QueryTask">
<select id="queryGlobalTask" resultMap="queryTask">
SELECT
alltask.*
FROM
@ -130,7 +130,7 @@
AND ll.`level` >= #{timeUnit}
</select>
<select id="queryRegularTask" resultType="com.ccsens.common.bean.vo.TaskVo$QueryTask">
<select id="queryRegularTask" resultMap="queryTask">
SELECT
alltask.*
FROM
@ -206,7 +206,7 @@
AND ll.`level` >= #{timeUnit}
</select>
<select id="continueQueryTask" resultType="com.ccsens.common.bean.vo.TaskVo$QueryTask">
<select id="continueQueryTask" resultMap="queryTask">
SELECT
alltask.*
FROM

Write Preview
Loading…
Cancel
Save