Browse Source

修改DTO VO名称

tall3
ma 4 years ago
parent
commit
6ffe1b2de9
  1. 100
      common/src/main/java/com/ccsens/common/bean/dto/CPluginDto.java
  2. 58
      common/src/main/java/com/ccsens/common/bean/dto/CProjectDto.java
  3. 58
      common/src/main/java/com/ccsens/common/bean/dto/CRoleDto.java
  4. 2
      common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java
  5. 66
      common/src/main/java/com/ccsens/common/bean/vo/CPluginVo.java
  6. 168
      common/src/main/java/com/ccsens/common/bean/vo/CProjectVo.java
  7. 74
      common/src/main/java/com/ccsens/common/bean/vo/CRoleVo.java
  8. 202
      common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java
  9. 4
      common/src/main/java/com/ccsens/common/persist/dao/ProParentTaskDao.java
  10. 4
      common/src/main/java/com/ccsens/common/persist/dao/ProProjectDao.java
  11. 14
      common/src/main/java/com/ccsens/common/persist/dao/ProTaskDetailDao.java
  12. 4
      common/src/main/java/com/ccsens/common/persist/dao/ProTaskPluginDao.java
  13. 4
      common/src/main/java/com/ccsens/common/service/IPluginService.java
  14. 8
      common/src/main/java/com/ccsens/common/service/IProRoleService.java
  15. 8
      common/src/main/java/com/ccsens/common/service/IProjectService.java
  16. 12
      common/src/main/java/com/ccsens/common/service/ITaskService.java
  17. 5
      common/src/main/java/com/ccsens/common/service/PluginService.java
  18. 25
      common/src/main/java/com/ccsens/common/service/ProRoleService.java
  19. 28
      common/src/main/java/com/ccsens/common/service/ProjectService.java
  20. 49
      common/src/main/java/com/ccsens/common/service/TaskService.java
  21. 2
      common/src/main/resources/mapper_dao/ProParentTaskDao.xml
  22. 2
      common/src/main/resources/mapper_dao/ProProjectDao.xml
  23. 4
      common/src/main/resources/mapper_dao/ProTaskDetailDao.xml
  24. 2
      common/src/main/resources/mapper_dao/ProTaskPluginDao.xml

100
common/src/main/java/com/ccsens/common/bean/dto/PluginDto.java → common/src/main/java/com/ccsens/common/bean/dto/CPluginDto.java

@ -1,50 +1,50 @@
package com.ccsens.common.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* @author
*/
@Data
public class PluginDto {
@Data
@ApiModel("根据id查看插件")
public static class GetPlugin{
@NotNull(message = "插件id不能为空")
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("样式类型 (1一行 2两行 3半屏)")
private int styleType;
}
@Data
@ApiModel("配置任务插件信息")
public static class UpdateTaskPlugin{
@NotNull(message = "任务详情id不能为空")
@ApiModelProperty("任务详情id")
private Long taskDetailId;
@NotNull(message = "插件id不能为空")
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("参数")
private String param;
@Min(1)
@ApiModelProperty("行")
private int row = 1;
@Min(1)
@ApiModelProperty("列")
private int col = 1;
@Min(1)
@ApiModelProperty("跨行")
private int rowspan = 1;
@Min(1)
@ApiModelProperty("跨列")
private int colspan = 1;
}
}
package com.ccsens.common.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* @author
*/
@Data
public class CPluginDto {
@Data
@ApiModel("根据id查看插件")
public static class GetPlugin{
@NotNull(message = "插件id不能为空")
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("样式类型 (1一行 2两行 3半屏)")
private int styleType;
}
@Data
@ApiModel("配置任务插件信息")
public static class UpdateTaskPlugin{
@NotNull(message = "任务详情id不能为空")
@ApiModelProperty("任务详情id")
private Long taskDetailId;
@NotNull(message = "插件id不能为空")
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("参数")
private String param;
@Min(1)
@ApiModelProperty("行")
private int row = 1;
@Min(1)
@ApiModelProperty("列")
private int col = 1;
@Min(1)
@ApiModelProperty("跨行")
private int rowspan = 1;
@Min(1)
@ApiModelProperty("跨列")
private int colspan = 1;
}
}

58
common/src/main/java/com/ccsens/common/bean/dto/ProjectDto.java → common/src/main/java/com/ccsens/common/bean/dto/CProjectDto.java

@ -1,29 +1,29 @@
package com.ccsens.common.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class ProjectDto {
@Data
@ApiModel("根据id查找项目信息")
public static class ProjectById {
@NotNull(message = "请选择项目")
@ApiModelProperty("项目id")
private Long projectId;
}
@Data
@ApiModel("根据模板复制项目")
public static class CopyProject{
@NotNull(message = "请选择要复制得项目")
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("新项目名字")
private String projectName;
}
}
package com.ccsens.common.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class CProjectDto {
@Data
@ApiModel("根据id查找项目信息")
public static class ProjectById {
@NotNull(message = "请选择项目")
@ApiModelProperty("项目id")
private Long projectId;
}
@Data
@ApiModel("根据模板复制项目")
public static class CopyProject{
@NotNull(message = "请选择要复制得项目")
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("新项目名字")
private String projectName;
}
}

58
common/src/main/java/com/ccsens/common/bean/dto/RoleDto.java → common/src/main/java/com/ccsens/common/bean/dto/CRoleDto.java

@ -1,29 +1,29 @@
package com.ccsens.common.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class RoleDto {
@Data
@ApiModel("查看角色栏展示")
public static class QueryRoleById{
@NotNull(message = "项目id不能为空")
@ApiModelProperty("项目id")
private Long projectId;
}
@Data
@ApiModel("修改角色栏展示")
public static class UpdateRoleShow{
@NotNull(message = "项目id不能为空")
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("角色id")
private List<Long> roleIds;
}
}
package com.ccsens.common.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class CRoleDto {
@Data
@ApiModel("查看角色栏展示")
public static class QueryRoleById{
@NotNull(message = "项目id不能为空")
@ApiModelProperty("项目id")
private Long projectId;
}
@Data
@ApiModel("修改角色栏展示")
public static class UpdateRoleShow{
@NotNull(message = "项目id不能为空")
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("角色id")
private List<Long> roleIds;
}
}

2
common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java → common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java

@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull;
* @author
*/
@Data
public class TaskDto {
public class CTaskDto {
@Data
@ApiModel("查看永久日常任务")

66
common/src/main/java/com/ccsens/common/bean/vo/PluginVo.java → common/src/main/java/com/ccsens/common/bean/vo/CPluginVo.java

@ -1,33 +1,33 @@
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author
*/
@Data
public class PluginVo {
@Data
@ApiModel("插件详情")
public static class PluginInfo{
@ApiModelProperty("插件id")
private Long id;
@ApiModelProperty("插件名称")
private String name;
@ApiModelProperty("插件简介")
private String intro;
@ApiModelProperty("插件版本")
private String version;
@ApiModelProperty("插件样式类型 1一行 2两行 3半屏")
private int styleType;
@ApiModelProperty("插件样式内容")
private String html;
@ApiModelProperty("插件的js功能")
private String js;
}
}
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author
*/
@Data
public class CPluginVo {
@Data
@ApiModel("插件详情")
public static class PluginInfo{
@ApiModelProperty("插件id")
private Long id;
@ApiModelProperty("插件名称")
private String name;
@ApiModelProperty("插件简介")
private String intro;
@ApiModelProperty("插件版本")
private String version;
@ApiModelProperty("插件样式类型 1一行 2两行 3半屏")
private int styleType;
@ApiModelProperty("插件样式内容")
private String html;
@ApiModelProperty("插件的js功能")
private String js;
}
}

168
common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java → common/src/main/java/com/ccsens/common/bean/vo/CProjectVo.java

@ -1,84 +1,84 @@
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author AUSU
*/
@Data
public class ProjectVo {
@Data
@ApiModel("项目信息")
public static class ProjectInfo{
@ApiModelProperty("项目id(任务详情id)")
private Long id;
@ApiModelProperty("项目名称")
private String name;
@ApiModelProperty("项目描述")
private String description;
@ApiModelProperty("重复频率")
private String cycle;
@ApiModelProperty("计划开始时间")
private Long planStartTime;
@ApiModelProperty("计划时长")
private Long planDuration;
@ApiModelProperty("计划结束时间")
private Long planEndTime;
@ApiModelProperty("真实开始时间")
private Long realStartTime;
@ApiModelProperty("真实时长")
private Long realDuration;
@ApiModelProperty("真实结束时间")
private Long realEndTime;
}
@Data
public static class SysProject{
@ApiModelProperty("项目id")
private Long id;
@ApiModelProperty("项目名称")
private String name;
@ApiModelProperty("开始时间")
private Long beginTime;
@ApiModelProperty("结束时间")
private Long endTime;
}
@Data
@ApiModel("复制的项目信息")
public static class CopyProjectInfo{
@ApiModelProperty("项目id")
private Long id;
// @ApiModelProperty("任务详情")
// private List<ProjectVo.TaskDetail> taskDetails;
}
@Data
@ApiModel("任务详情")
public static class TaskDetail{
@ApiModelProperty("任务详情id")
private Long taskDetailId;
@ApiModelProperty("任务详情名称")
private String taskDetailName;
@ApiModelProperty("任务等级")
private Byte taskDetailLevel;
@ApiModelProperty("任务详情下的分解任务")
private List<ProjectVo.TaskSub> taskSubList;
}
@Data
@ApiModel("分解任务")
public static class TaskSub{
@ApiModelProperty("分解任务id")
private Long taskSubId;
@ApiModelProperty("分解任务开始时间")
private Long startTime;
@ApiModelProperty("分解任务结束时间")
private Long endTime;
}
}
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author AUSU
*/
@Data
public class CProjectVo {
@Data
@ApiModel("项目信息")
public static class ProjectInfo{
@ApiModelProperty("项目id(任务详情id)")
private Long id;
@ApiModelProperty("项目名称")
private String name;
@ApiModelProperty("项目描述")
private String description;
@ApiModelProperty("重复频率")
private String cycle;
@ApiModelProperty("计划开始时间")
private Long planStartTime;
@ApiModelProperty("计划时长")
private Long planDuration;
@ApiModelProperty("计划结束时间")
private Long planEndTime;
@ApiModelProperty("真实开始时间")
private Long realStartTime;
@ApiModelProperty("真实时长")
private Long realDuration;
@ApiModelProperty("真实结束时间")
private Long realEndTime;
}
@Data
public static class SysProject{
@ApiModelProperty("项目id")
private Long id;
@ApiModelProperty("项目名称")
private String name;
@ApiModelProperty("开始时间")
private Long beginTime;
@ApiModelProperty("结束时间")
private Long endTime;
}
@Data
@ApiModel("复制的项目信息")
public static class CopyProjectInfo{
@ApiModelProperty("项目id")
private Long id;
// @ApiModelProperty("任务详情")
// private List<ProjectVo.TaskDetail> taskDetails;
}
@Data
@ApiModel("任务详情")
public static class TaskDetail{
@ApiModelProperty("任务详情id")
private Long taskDetailId;
@ApiModelProperty("任务详情名称")
private String taskDetailName;
@ApiModelProperty("任务等级")
private Byte taskDetailLevel;
@ApiModelProperty("任务详情下的分解任务")
private List<CProjectVo.TaskSub> taskSubList;
}
@Data
@ApiModel("分解任务")
public static class TaskSub{
@ApiModelProperty("分解任务id")
private Long taskSubId;
@ApiModelProperty("分解任务开始时间")
private Long startTime;
@ApiModelProperty("分解任务结束时间")
private Long endTime;
}
}

74
common/src/main/java/com/ccsens/common/bean/vo/RoleVo.java → common/src/main/java/com/ccsens/common/bean/vo/CRoleVo.java

@ -1,37 +1,37 @@
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author
*/
@Data
public class RoleVo {
@Data
@ApiModel("查看角色栏展示的角色信息")
public static class QueryRole {
@ApiModelProperty("展示的角色信息")
private List<RoleInfo> visibleList;
@ApiModelProperty("不展示的角色信息")
private List<RoleInfo> invisibleList;
}
@Data
@ApiModel("角色信息")
public static class RoleInfo {
@ApiModelProperty("角色id")
private Long id;
@ApiModelProperty("是否是项目经理 0否 1是")
private Long pm;
@ApiModelProperty("是否是自己所属的角色 0否 1是")
private Long mine;
@ApiModelProperty("角色名")
private String name;
@ApiModelProperty("排序")
private Long sequence;
}
}
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author
*/
@Data
public class CRoleVo {
@Data
@ApiModel("查看角色栏展示的角色信息")
public static class QueryRole {
@ApiModelProperty("展示的角色信息")
private List<RoleInfo> visibleList;
@ApiModelProperty("不展示的角色信息")
private List<RoleInfo> invisibleList;
}
@Data
@ApiModel("角色信息")
public static class RoleInfo {
@ApiModelProperty("角色id")
private Long id;
@ApiModelProperty("是否是项目经理 0否 1是")
private Long pm;
@ApiModelProperty("是否是自己所属的角色 0否 1是")
private Long mine;
@ApiModelProperty("角色名")
private String name;
@ApiModelProperty("排序")
private Long sequence;
}
}

202
common/src/main/java/com/ccsens/common/bean/vo/TaskVo.java → common/src/main/java/com/ccsens/common/bean/vo/CTaskVo.java

@ -1,101 +1,101 @@
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class TaskVo {
@Data
@ApiModel("查看定期任务返回值")
public static class QueryTask{
@ApiModelProperty("任务id(任务分解id)")
private Long id;
@ApiModelProperty("详情id")
private Long detailId;
@ApiModelProperty("任务名")
private String name;
@ApiModelProperty("任务详情")
private String description;
@ApiModelProperty("计划开始时间")
private Long planStart;
@ApiModelProperty("计划时长")
private Long planDuration;
@ApiModelProperty("实际开始时间")
private Long realStart;
@ApiModelProperty("实际时长")
private Long realDuration;
@ApiModelProperty("任务状态 0未开始 1进行中 2暂停中 3已完成")
private int process;
@ApiModelProperty("任务流转策略 -1不跳转 0直接跳转 如果是其他正整数 就是多少毫秒后跳转 ")
private Long skip;
@ApiModelProperty("跳转的任务id")
private Long skipTaskId;
@ApiModelProperty("任务面板")
private PanelInfo panel;
@ApiModelProperty("插件")
private List<List<TaskPluginInfo>> plugins;
}
@Data
@ApiModel("任务面板信息")
public static class PanelInfo{
@ApiModelProperty("背景色")
private String backgroundColor;
@ApiModelProperty("圆角")
private String borderRadius;
@ApiModelProperty("边框")
private String border;
@ApiModelProperty("阴影")
private String shadow;
@ApiModelProperty("宽")
private String width;
@ApiModelProperty("高")
private String height;
@ApiModelProperty("行")
private int row;
@ApiModelProperty("列")
private int col;
}
@Data
@ApiModel("任务下的插件信息")
public static class TaskPluginInfo{
@ApiModelProperty("插件任务关联id")
private Long pluginTaskId;
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("参数")
private String param;
@ApiModelProperty("行")
private int row;
@ApiModelProperty("列")
private int col;
@ApiModelProperty("跨行")
private int rowspan;
@ApiModelProperty("跨列")
private int colspan;
}
@Data
@ApiModel("任务详情")
public static class TaskDetail{
@ApiModelProperty("任务详情id")
private Long detailId;
@ApiModelProperty("任务名称")
private String name;
@ApiModelProperty("任务描述")
private String description;
@ApiModelProperty("重复频率")
private String cycle;
//以下是任务关系表
@ApiModelProperty("任务关系表id")
private Long parentTaskId;
@ApiModelProperty("父级任务id")
private Long parentTaskDetailId;
}
}
package com.ccsens.common.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class CTaskVo {
@Data
@ApiModel("查看定期任务返回值")
public static class QueryTask{
@ApiModelProperty("任务id(任务分解id)")
private Long id;
@ApiModelProperty("详情id")
private Long detailId;
@ApiModelProperty("任务名")
private String name;
@ApiModelProperty("任务详情")
private String description;
@ApiModelProperty("计划开始时间")
private Long planStart;
@ApiModelProperty("计划时长")
private Long planDuration;
@ApiModelProperty("实际开始时间")
private Long realStart;
@ApiModelProperty("实际时长")
private Long realDuration;
@ApiModelProperty("任务状态 0未开始 1进行中 2暂停中 3已完成")
private int process;
@ApiModelProperty("任务流转策略 -1不跳转 0直接跳转 如果是其他正整数 就是多少毫秒后跳转 ")
private Long skip;
@ApiModelProperty("跳转的任务id")
private Long skipTaskId;
@ApiModelProperty("任务面板")
private PanelInfo panel;
@ApiModelProperty("插件")
private List<List<TaskPluginInfo>> plugins;
}
@Data
@ApiModel("任务面板信息")
public static class PanelInfo{
@ApiModelProperty("背景色")
private String backgroundColor;
@ApiModelProperty("圆角")
private String borderRadius;
@ApiModelProperty("边框")
private String border;
@ApiModelProperty("阴影")
private String shadow;
@ApiModelProperty("宽")
private String width;
@ApiModelProperty("高")
private String height;
@ApiModelProperty("行")
private int row;
@ApiModelProperty("列")
private int col;
}
@Data
@ApiModel("任务下的插件信息")
public static class TaskPluginInfo{
@ApiModelProperty("插件任务关联id")
private Long pluginTaskId;
@ApiModelProperty("插件id")
private Long pluginId;
@ApiModelProperty("参数")
private String param;
@ApiModelProperty("行")
private int row;
@ApiModelProperty("列")
private int col;
@ApiModelProperty("跨行")
private int rowspan;
@ApiModelProperty("跨列")
private int colspan;
}
@Data
@ApiModel("任务详情")
public static class TaskDetail{
@ApiModelProperty("任务详情id")
private Long detailId;
@ApiModelProperty("任务名称")
private String name;
@ApiModelProperty("任务描述")
private String description;
@ApiModelProperty("重复频率")
private String cycle;
//以下是任务关系表
@ApiModelProperty("任务关系表id")
private Long parentTaskId;
@ApiModelProperty("父级任务id")
private Long parentTaskDetailId;
}
}

4
common/src/main/java/com/ccsens/common/persist/dao/ProParentTaskDao.java

@ -1,7 +1,7 @@
package com.ccsens.common.persist.dao;
import com.ccsens.common.bean.po.ProParentTask;
import com.ccsens.common.bean.vo.TaskVo;
import com.ccsens.common.bean.vo.CTaskVo;
import com.ccsens.common.persist.mapper.ProParentTaskMapper;
import org.apache.ibatis.annotations.Param;
@ -17,7 +17,7 @@ public interface ProParentTaskDao extends ProParentTaskMapper {
* @param oldProjectId 项目id
* @return 一级任务列表
*/
List<TaskVo.TaskDetail> findTaskByParentId(@Param("oldProjectId") Long oldProjectId);
List<CTaskVo.TaskDetail> findTaskByParentId(@Param("oldProjectId") Long oldProjectId);
/**
* 保存所有任务关系

4
common/src/main/java/com/ccsens/common/persist/dao/ProProjectDao.java

@ -1,6 +1,6 @@
package com.ccsens.common.persist.dao;
import com.ccsens.common.bean.vo.ProjectVo;
import com.ccsens.common.bean.vo.CProjectVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -15,5 +15,5 @@ public interface ProProjectDao{
* @param projectId 项目id(任务详情id)
* @return 项目详情
*/
ProjectVo.ProjectInfo findProjectById(@Param("projectId") Long projectId);
CProjectVo.ProjectInfo findProjectById(@Param("projectId") Long projectId);
}

14
common/src/main/java/com/ccsens/common/persist/dao/ProTaskDetailDao.java

@ -2,7 +2,7 @@ package com.ccsens.common.persist.dao;
import com.ccsens.common.bean.po.ProTaskDetail;
import com.ccsens.common.bean.po.ProTaskStatusRecord;
import com.ccsens.common.bean.vo.TaskVo;
import com.ccsens.common.bean.vo.CTaskVo;
import com.ccsens.common.persist.mapper.ProTaskDetailMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -19,7 +19,7 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
* @param roleId 角色id
* @return 永久日常任务列表
*/
List<TaskVo.QueryTask> queryPermanentGlobalTask(@Param("roleId") Long roleId);
List<CTaskVo.QueryTask> queryPermanentGlobalTask(@Param("roleId") Long roleId);
/**
* 根据角色和时间节点查找日常任务
@ -28,7 +28,7 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
* @param timeUnit 时间颗粒度
* @return 日常任务列表
*/
List<TaskVo.QueryTask> queryGlobalTask(@Param("roleId") Long roleId,@Param("timeNode") Long timeNode,@Param("timeUnit") int timeUnit);
List<CTaskVo.QueryTask> queryGlobalTask(@Param("roleId") Long roleId, @Param("timeNode") Long timeNode, @Param("timeUnit") int timeUnit);
/**
* 根据时间和角色查找定期任务
@ -40,8 +40,8 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
* @param timeFormat 时间格式
* @return 定期任务列表
*/
List<TaskVo.QueryTask> queryRegularTask(@Param("roleId") Long roleId,@Param("timeUnit") int timeUnit,@Param("timeNode") Long timeNode
,@Param("queryType") int queryType,@Param("query") String query,@Param("timeFormat") String timeFormat);
List<CTaskVo.QueryTask> queryRegularTask(@Param("roleId") Long roleId, @Param("timeUnit") int timeUnit, @Param("timeNode") Long timeNode
, @Param("queryType") int queryType, @Param("query") String query, @Param("timeFormat") String timeFormat);
/**
* 继续向上/向下查找
@ -53,8 +53,8 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
* @param timeFormat 时间格式
* @return 定期任务列表
*/
List<TaskVo.QueryTask> continueQueryTask(@Param("roleId") Long roleId,@Param("timeUnit") int timeUnit,@Param("timeNode") Long timeNode
,@Param("queryType") int queryType,@Param("query") String query,@Param("timeFormat") String timeFormat);
List<CTaskVo.QueryTask> continueQueryTask(@Param("roleId") Long roleId, @Param("timeUnit") int timeUnit, @Param("timeNode") Long timeNode
, @Param("queryType") int queryType, @Param("query") String query, @Param("timeFormat") String timeFormat);
/**
* 根据任务详情id查找项目id

4
common/src/main/java/com/ccsens/common/persist/dao/ProTaskPluginDao.java

@ -1,7 +1,7 @@
package com.ccsens.common.persist.dao;
import com.ccsens.common.bean.po.ProTaskPlugin;
import com.ccsens.common.bean.vo.TaskVo;
import com.ccsens.common.bean.vo.CTaskVo;
import com.ccsens.common.persist.mapper.ProTaskPluginMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -18,7 +18,7 @@ public interface ProTaskPluginDao extends ProTaskPluginMapper {
* @param detailTaskId 任务详情id
* @return 插件列表
*/
List<TaskVo.TaskPluginInfo> queryTaskOfPlugin(@Param("detailTaskId") Long detailTaskId);
List<CTaskVo.TaskPluginInfo> queryTaskOfPlugin(@Param("detailTaskId") Long detailTaskId);
/**
* 根据任务id列表查询任务插件

4
common/src/main/java/com/ccsens/common/service/IPluginService.java

@ -1,11 +1,11 @@
package com.ccsens.common.service;
import com.ccsens.common.bean.dto.PluginDto;
import com.ccsens.common.bean.dto.CPluginDto;
public interface IPluginService {
/**
* 配置任务插件关联信息
*/
void updateTaskPlugin(PluginDto.UpdateTaskPlugin updateTaskPlugin);
void updateTaskPlugin(CPluginDto.UpdateTaskPlugin updateTaskPlugin);
}

8
common/src/main/java/com/ccsens/common/service/IProRoleService.java

@ -1,11 +1,11 @@
package com.ccsens.common.service;
import com.ccsens.common.bean.dto.RoleDto;
import com.ccsens.common.bean.vo.RoleVo;
import com.ccsens.common.bean.dto.CRoleDto;
import com.ccsens.common.bean.vo.CRoleVo;
public interface IProRoleService {
RoleVo.QueryRole QueryShowRole(RoleDto.QueryRoleById param, Long userId);
CRoleVo.QueryRole QueryShowRole(CRoleDto.QueryRoleById param, Long userId);
void updateShowRole(RoleDto.UpdateRoleShow param, Long userId);
void updateShowRole(CRoleDto.UpdateRoleShow param, Long userId);
}

8
common/src/main/java/com/ccsens/common/service/IProjectService.java

@ -1,7 +1,7 @@
package com.ccsens.common.service;
import com.ccsens.common.bean.dto.ProjectDto;
import com.ccsens.common.bean.vo.ProjectVo;
import com.ccsens.common.bean.dto.CProjectDto;
import com.ccsens.common.bean.vo.CProjectVo;
/**
* @author ma
@ -13,7 +13,7 @@ public interface IProjectService {
* @param userId 当前用户id
* @return 返回项目信息
*/
ProjectVo.ProjectInfo findProjectById(ProjectDto.ProjectById param, Long userId);
CProjectVo.ProjectInfo findProjectById(CProjectDto.ProjectById param, Long userId);
/**
* 复制项目
@ -21,5 +21,5 @@ public interface IProjectService {
* @param userId 用户id
* @return 新项目
*/
ProjectVo.CopyProjectInfo copyProject(ProjectDto.CopyProject param, Long userId);
CProjectVo.CopyProjectInfo copyProject(CProjectDto.CopyProject param, Long userId);
}

12
common/src/main/java/com/ccsens/common/service/ITaskService.java

@ -1,7 +1,7 @@
package com.ccsens.common.service;
import com.ccsens.common.bean.dto.TaskDto;
import com.ccsens.common.bean.vo.TaskVo;
import com.ccsens.common.bean.dto.CTaskDto;
import com.ccsens.common.bean.vo.CTaskVo;
import java.util.List;
@ -15,7 +15,7 @@ public interface ITaskService {
* @param userId 用户id
* @return 永久日常任务列表
*/
List<TaskVo.QueryTask> queryPermanentGlobalTask(TaskDto.QueryPermanentGlobalTask param, Long userId);
List<CTaskVo.QueryTask> queryPermanentGlobalTask(CTaskDto.QueryPermanentGlobalTask param, Long userId);
/**
* 根据时间和角色查找日常任务
@ -23,7 +23,7 @@ public interface ITaskService {
* @param userId 用户id
* @return 日常任务列表
*/
List<TaskVo.QueryTask> queryGlobalTask(TaskDto.QueryGlobalTask param, Long userId);
List<CTaskVo.QueryTask> queryGlobalTask(CTaskDto.QueryGlobalTask param, Long userId);
/**
* 根据时间和角色查找定期任务
@ -31,12 +31,12 @@ public interface ITaskService {
* @param userId 用户id
* @return 定期任务列表
*/
List<TaskVo.QueryTask> queryRegularTask(TaskDto.QueryRegularTask param, Long userId);
List<CTaskVo.QueryTask> queryRegularTask(CTaskDto.QueryRegularTask param, Long userId);
/**
* 根据时间和角色查找定期任务
* @param param 任务分解id和任务状态
* @param userId 用户id
*/
void updateTaskType(TaskDto.UpdateTaskType param, Long userId) throws Exception;
void updateTaskType(CTaskDto.UpdateTaskType param, Long userId) throws Exception;
}

5
common/src/main/java/com/ccsens/common/service/PluginService.java

@ -4,12 +4,11 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.common.bean.dto.PluginDto;
import com.ccsens.common.bean.dto.CPluginDto;
import com.ccsens.common.bean.po.ProTaskPlugin;
import com.ccsens.common.bean.po.ProTaskPluginExample;
import com.ccsens.common.persist.dao.ProTaskPluginDao;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.apache.bcel.classfile.Code;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@ -27,7 +26,7 @@ public class PluginService implements IPluginService{
private Snowflake snowflake;
@Override
public void updateTaskPlugin(PluginDto.UpdateTaskPlugin updateTaskPlugin) {
public void updateTaskPlugin(CPluginDto.UpdateTaskPlugin updateTaskPlugin) {
//根据任务id和插件id查找以前的关联信息
ProTaskPluginExample taskPluginExample = new ProTaskPluginExample();
taskPluginExample.createCriteria().andTaskDetailIdEqualTo(updateTaskPlugin.getTaskDetailId())

25
common/src/main/java/com/ccsens/common/service/ProRoleService.java

@ -4,14 +4,13 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.common.bean.dto.RoleDto;
import com.ccsens.common.bean.dto.CRoleDto;
import com.ccsens.common.bean.po.*;
import com.ccsens.common.bean.vo.RoleVo;
import com.ccsens.common.bean.vo.CRoleVo;
import com.ccsens.common.persist.dao.LabelDao;
import com.ccsens.common.persist.dao.ProRoleDao;
import com.ccsens.common.persist.mapper.*;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.WebConstant;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -50,12 +49,12 @@ public class ProRoleService implements IProRoleService {
@Override
public RoleVo.QueryRole QueryShowRole(RoleDto.QueryRoleById param, Long userId) {
RoleVo.QueryRole role = new RoleVo.QueryRole();
public CRoleVo.QueryRole QueryShowRole(CRoleDto.QueryRoleById param, Long userId) {
CRoleVo.QueryRole role = new CRoleVo.QueryRole();
//角色显示的角色
List<RoleVo.RoleInfo> visibleList = new ArrayList<>();
List<CRoleVo.RoleInfo> visibleList = new ArrayList<>();
//不显示的角色
List<RoleVo.RoleInfo> invisibleList = new ArrayList<>();
List<CRoleVo.RoleInfo> invisibleList = new ArrayList<>();
//查询当前用户所属的角色的list
List<Long> roleIds = new ArrayList<>();
//对自己不可见的角色的list
@ -232,7 +231,7 @@ public class ProRoleService implements IProRoleService {
}
//proRoles1里面就是没有设置过的
for (int i = 0; i < proRoles1.size(); i++) {
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
CRoleVo.RoleInfo RoleInfo1 = new CRoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm
@ -265,7 +264,7 @@ public class ProRoleService implements IProRoleService {
ProRoleExample proRoleExample = new ProRoleExample();
proRoleExample.createCriteria().andIdEqualTo(proRoleShow.getRoleId());
List<ProRole> proRoles2 = proRoleMapper.selectByExample(proRoleExample);
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
CRoleVo.RoleInfo RoleInfo1 = new CRoleVo.RoleInfo();
RoleInfo1.setId(proRoles2.get(0).getId());
RoleInfo1.setName(proRoles2.get(0).getName());
//是否是pm 0否 1 是 //通过标签来定义 5 和 2 34是
@ -298,7 +297,7 @@ public class ProRoleService implements IProRoleService {
//循环查询到的角色,放入“显示角色”的数组内 数组长度大于等于5
if(proRoles1.size()<6){
for (int i = 0; i < proRoles1.size(); i++) {
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
CRoleVo.RoleInfo RoleInfo1 = new CRoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm
@ -330,7 +329,7 @@ public class ProRoleService implements IProRoleService {
if (proRoles1.size() >= 6) {
for (int i = 0; i < 5; i++) {
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
CRoleVo.RoleInfo RoleInfo1 = new CRoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm
@ -362,7 +361,7 @@ public class ProRoleService implements IProRoleService {
//将剩下的角色放入“隐藏角色”数组
for (int i = 5; i < proRoles1.size(); i++) {
RoleVo.RoleInfo RoleInfo1 = new RoleVo.RoleInfo();
CRoleVo.RoleInfo RoleInfo1 = new CRoleVo.RoleInfo();
RoleInfo1.setId(proRoles1.get(i).getId());
RoleInfo1.setName(proRoles1.get(i).getName());
//是否是pm
@ -398,7 +397,7 @@ public class ProRoleService implements IProRoleService {
}
@Override
public void updateShowRole(RoleDto.UpdateRoleShow param, Long userId) {
public void updateShowRole(CRoleDto.UpdateRoleShow param, Long userId) {
//判断入参内的角色判断入参内的角色id列表是否为空
if(param.getRoleIds().size()==0){
throw new BaseException(CodeEnum.NOT_ROLE);

28
common/src/main/java/com/ccsens/common/service/ProjectService.java

@ -5,10 +5,10 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ccsens.common.bean.dto.ProjectDto;
import com.ccsens.common.bean.dto.CProjectDto;
import com.ccsens.common.bean.po.*;
import com.ccsens.common.bean.vo.ProjectVo;
import com.ccsens.common.bean.vo.TaskVo;
import com.ccsens.common.bean.vo.CProjectVo;
import com.ccsens.common.bean.vo.CTaskVo;
import com.ccsens.common.persist.dao.*;
import com.ccsens.common.util.CommonCodeError;
import com.ccsens.util.exception.BaseException;
@ -61,8 +61,8 @@ public class ProjectService implements IProjectService{
private ProTaskVersionDao taskVersionDao;
@Override
public ProjectVo.ProjectInfo findProjectById(ProjectDto.ProjectById param, Long userId) {
ProjectVo.ProjectInfo projectById = projectDao.findProjectById(param.getProjectId());
public CProjectVo.ProjectInfo findProjectById(CProjectDto.ProjectById param, Long userId) {
CProjectVo.ProjectInfo projectById = projectDao.findProjectById(param.getProjectId());
if (ObjectUtil.isNull(projectById)){
throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND);
}
@ -70,12 +70,12 @@ public class ProjectService implements IProjectService{
}
@Override
public ProjectVo.CopyProjectInfo copyProject(ProjectDto.CopyProject param, Long userId) {
ProjectVo.ProjectInfo oldProject = projectDao.findProjectById(param.getProjectId());
public CProjectVo.CopyProjectInfo copyProject(CProjectDto.CopyProject param, Long userId) {
CProjectVo.ProjectInfo oldProject = projectDao.findProjectById(param.getProjectId());
if (ObjectUtil.isNull(oldProject)){
throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND);
}
ProjectVo.CopyProjectInfo copyProject = new ProjectVo.CopyProjectInfo();
CProjectVo.CopyProjectInfo copyProject = new CProjectVo.CopyProjectInfo();
long currentTime = System.currentTimeMillis();
//复制项目到任务详情表
@ -198,20 +198,20 @@ public class ProjectService implements IProjectService{
private void copyTask(Long oldProjectId, Long newProjectId, Long userId, Map<Long, Long> oldAndNewRoleId) {
List<ProParentTask> newParentTaskList = new ArrayList<>();
//查找项目下的一级任务
List<TaskVo.TaskDetail> oldFirstTaskDetailList = parentTaskDao.findTaskByParentId(oldProjectId);
List<CTaskVo.TaskDetail> oldFirstTaskDetailList = parentTaskDao.findTaskByParentId(oldProjectId);
Map<Long,Long> oldAndNewTaskDetailId = new HashMap<>();
//1.把项目id放到任务id的map中,后续要删除
oldAndNewTaskDetailId.put(oldProjectId,newProjectId);
if (CollectionUtil.isNotEmpty(oldFirstTaskDetailList)) {
List<ProTaskDetail> newTaskDetailList = new ArrayList<>();
List<ProTaskSub> newTaskSubList = new ArrayList<>();
for (TaskVo.TaskDetail oldFirstTaskDetail : oldFirstTaskDetailList) {
for (CTaskVo.TaskDetail oldFirstTaskDetail : oldFirstTaskDetailList) {
//循环处理一级任务及一级任务的分解任务
taskLoop(newTaskDetailList,newTaskSubList,oldAndNewTaskDetailId,oldFirstTaskDetail,oldProjectId,newParentTaskList);
//查询二级任务
List<TaskVo.TaskDetail> oldSecondTaskDetailList = parentTaskDao.findTaskByParentId(oldFirstTaskDetail.getDetailId());
List<CTaskVo.TaskDetail> oldSecondTaskDetailList = parentTaskDao.findTaskByParentId(oldFirstTaskDetail.getDetailId());
if (CollectionUtil.isNotEmpty(oldSecondTaskDetailList)) {
for (TaskVo.TaskDetail oldSecondTaskDetail : oldSecondTaskDetailList) {
for (CTaskVo.TaskDetail oldSecondTaskDetail : oldSecondTaskDetailList) {
//循环处理二级任务及二级任务的分级任务
taskLoop(newTaskDetailList,newTaskSubList,oldAndNewTaskDetailId,oldSecondTaskDetail,oldSecondTaskDetail.getParentTaskDetailId(),newParentTaskList);
}
@ -332,8 +332,8 @@ public class ProjectService implements IProjectService{
}
}
private void taskLoop(List<ProTaskDetail> newTaskDetailList,List<ProTaskSub> newTaskSubList,Map<Long,Long> oldAndNewTaskDetailId
,TaskVo.TaskDetail oldTaskDetail,Long parentTaskId,List<ProParentTask> newParentTaskList) {
private void taskLoop(List<ProTaskDetail> newTaskDetailList, List<ProTaskSub> newTaskSubList, Map<Long,Long> oldAndNewTaskDetailId
, CTaskVo.TaskDetail oldTaskDetail, Long parentTaskId, List<ProParentTask> newParentTaskList) {
ProTaskDetail newTaskDetail = new ProTaskDetail();
newTaskDetail.setId(snowflake.nextId());
newTaskDetail.setName(oldTaskDetail.getName());

49
common/src/main/java/com/ccsens/common/service/TaskService.java

@ -4,14 +4,13 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.common.bean.dto.TaskDto;
import com.ccsens.common.bean.dto.CTaskDto;
import com.ccsens.common.bean.message.TaskMessageWithStatus;
import com.ccsens.common.bean.po.ProTaskStatusRecord;
import com.ccsens.common.bean.po.ProTaskSub;
import com.ccsens.common.bean.vo.TaskVo;
import com.ccsens.common.bean.vo.CTaskVo;
import com.ccsens.common.persist.dao.*;
import com.ccsens.common.persist.mapper.ProTaskStatusRecordMapper;
import com.ccsens.common.persist.mapper.ProTaskSubMapper;
import com.ccsens.common.util.CommonCodeError;
import com.ccsens.common.util.Constant;
import com.ccsens.util.JacksonUtil;
@ -103,10 +102,10 @@ public class TaskService implements ITaskService {
*
* @param taskList 任务列表
*/
public void queryPluginForTask(List<TaskVo.QueryTask> taskList) {
public void queryPluginForTask(List<CTaskVo.QueryTask> taskList) {
if (CollectionUtil.isNotEmpty(taskList)) {
for (TaskVo.QueryTask queryTask : taskList) {
List<List<TaskVo.TaskPluginInfo>> plugins = new ArrayList<>();
for (CTaskVo.QueryTask queryTask : taskList) {
List<List<CTaskVo.TaskPluginInfo>> plugins = new ArrayList<>();
//如果任务面板信息不为空,则根据任务面板的行/列创建二维数组
if (ObjectUtil.isNotNull(queryTask.getPanel())) {
int panelRow = queryTask.getPanel().getRow();
@ -115,7 +114,7 @@ public class TaskService implements ITaskService {
//创建任务面板的二维数组
createSecondPanel(plugins, panelRow, panelCol);
//将插件放入二维数组对应的位置中
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(queryTask.getDetailId());
List<CTaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(queryTask.getDetailId());
putDateInList(taskPluginInfoList, plugins, queryTask);
} else {
//根据插件最大的行和列创建二维数组
@ -136,11 +135,11 @@ public class TaskService implements ITaskService {
* @param plugins 插件列表
* @param queryTask 任务
*/
public void createPanelByPlugin(Long taskDetailId, List<List<TaskVo.TaskPluginInfo>> plugins, TaskVo.QueryTask queryTask) {
List<TaskVo.TaskPluginInfo> taskPluginInfoList = taskPluginDao.queryTaskOfPlugin(taskDetailId);
public void createPanelByPlugin(Long taskDetailId, List<List<CTaskVo.TaskPluginInfo>> plugins, CTaskVo.QueryTask queryTask) {
List<CTaskVo.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());
List<Integer> col = taskPluginInfoList.stream().map(CTaskVo.TaskPluginInfo::getCol).collect(Collectors.toList());
List<Integer> row = taskPluginInfoList.stream().map(CTaskVo.TaskPluginInfo::getRow).collect(Collectors.toList());
Integer newCol = Collections.max(col);
Integer newRow = Collections.max(row);
//创建任务面板的二维数组
@ -157,9 +156,9 @@ public class TaskService implements ITaskService {
* @param row
* @param col
*/
public void createSecondPanel(List<List<TaskVo.TaskPluginInfo>> plugins, int row, int col) {
public void createSecondPanel(List<List<CTaskVo.TaskPluginInfo>> plugins, int row, int col) {
for (int i = 0; i < row; i++) {
List<TaskVo.TaskPluginInfo> pluginInfoList = new ArrayList<>();
List<CTaskVo.TaskPluginInfo> pluginInfoList = new ArrayList<>();
for (int j = 0; j < col; j++) {
pluginInfoList.add(null);
}
@ -174,8 +173,8 @@ public class TaskService implements ITaskService {
* @param plugins 插件列表
* @param queryTask 任务
*/
public void putDateInList(List<TaskVo.TaskPluginInfo> taskPluginInfoList, List<List<TaskVo.TaskPluginInfo>> plugins, TaskVo.QueryTask queryTask) {
for (TaskVo.TaskPluginInfo taskPlugin : taskPluginInfoList) {
public void putDateInList(List<CTaskVo.TaskPluginInfo> taskPluginInfoList, List<List<CTaskVo.TaskPluginInfo>> plugins, CTaskVo.QueryTask queryTask) {
for (CTaskVo.TaskPluginInfo taskPlugin : taskPluginInfoList) {
int pluginCol = taskPlugin.getCol();
int pluginRow = taskPlugin.getRow();
if (0 == pluginCol || 0 == pluginRow) {
@ -187,13 +186,13 @@ public class TaskService implements ITaskService {
}
@Override
public List<TaskVo.QueryTask> queryPermanentGlobalTask(TaskDto.QueryPermanentGlobalTask param, Long userId) {
public List<CTaskVo.QueryTask> queryPermanentGlobalTask(CTaskDto.QueryPermanentGlobalTask param, Long userId) {
//查找当前角色是否有查看权限
Boolean isLook = queryRoleIsLook(param.getRoleId(), userId);
if (BooleanUtil.isFalse(isLook)) {
throw new BaseException(CommonCodeError.NOT_PERMISSION);
}
List<TaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(param.getRoleId());
List<CTaskVo.QueryTask> permanentGlobalTask = taskDetailDao.queryPermanentGlobalTask(param.getRoleId());
//查找项目面板和插件信息
queryPluginForTask(permanentGlobalTask);
@ -201,19 +200,19 @@ public class TaskService implements ITaskService {
}
@Override
public List<TaskVo.QueryTask> queryGlobalTask(TaskDto.QueryGlobalTask param, Long userId) {
public List<CTaskVo.QueryTask> queryGlobalTask(CTaskDto.QueryGlobalTask param, Long userId) {
//查找当前角色是否有查看权限
Boolean isLook = queryRoleIsLook(param.getRoleId(), userId);
if (BooleanUtil.isFalse(isLook)) {
throw new BaseException(CommonCodeError.NOT_PERMISSION);
}
List<TaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(param.getRoleId(), param.getTimeNode(), param.getTimeUnit());
List<CTaskVo.QueryTask> globalTask = taskDetailDao.queryGlobalTask(param.getRoleId(), param.getTimeNode(), param.getTimeUnit());
queryPluginForTask(globalTask);
return globalTask;
}
@Override
public List<TaskVo.QueryTask> queryRegularTask(TaskDto.QueryRegularTask param, Long userId) {
public List<CTaskVo.QueryTask> queryRegularTask(CTaskDto.QueryRegularTask param, Long userId) {
//查找类型:0向上查找,1向下查找(默认),下查包含自己,上查不包含
//根据参数配置sql语句
String query = "";
@ -230,11 +229,11 @@ public class TaskService implements ITaskService {
throw new BaseException(CommonCodeError.NOT_PERMISSION);
}
//TODO 季度未实现
List<TaskVo.QueryTask> regularTask = taskDetailDao.queryRegularTask(param.getRoleId(), param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat);
List<CTaskVo.QueryTask> regularTask = taskDetailDao.queryRegularTask(param.getRoleId(), param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat);
//如果该时段没有任务向上或向下补充
if (CollectionUtil.isEmpty(regularTask)) {
List<TaskVo.QueryTask> replenishTask = taskDetailDao.continueQueryTask(param.getRoleId(), param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat);
Map<String, List<TaskVo.QueryTask>> taskMap = replenishTask.stream().collect(Collectors.groupingBy(task -> new SimpleDateFormat("yyyy-MM-dd").format(new Date(task.getPlanStart()))));
List<CTaskVo.QueryTask> replenishTask = taskDetailDao.continueQueryTask(param.getRoleId(), param.getTimeUnit(), param.getTimeNode(), param.getQueryType(), query, timeFormat);
Map<String, List<CTaskVo.QueryTask>> taskMap = replenishTask.stream().collect(Collectors.groupingBy(task -> new SimpleDateFormat("yyyy-MM-dd").format(new Date(task.getPlanStart()))));
List<String> mapOfKey = new ArrayList<>();
taskMap.forEach((key, val) -> mapOfKey.add(key));
if (CollectionUtil.isNotEmpty(mapOfKey)) {
@ -263,7 +262,7 @@ public class TaskService implements ITaskService {
* @param userId 用户id
*/
@Override
public void updateTaskType(TaskDto.UpdateTaskType param, Long userId) throws Exception {
public void updateTaskType(CTaskDto.UpdateTaskType param, Long userId) throws Exception {
//验证任务是否存在
ProTaskSub proTaskSub = taskSubDao.selectByPrimaryKey(param.getId());
if (ObjectUtil.isNull(proTaskSub)) {
@ -414,7 +413,7 @@ public class TaskService implements ITaskService {
/**
* 修改任务状态时添加修改记录
*/
public void saveTaskStatusRecord(TaskDto.UpdateTaskType param, Long userId, Long now) {
public void saveTaskStatusRecord(CTaskDto.UpdateTaskType param, Long userId, Long now) {
ProTaskStatusRecord taskStatusRecord = new ProTaskStatusRecord();
taskStatusRecord.setId(snowflake.nextId());
taskStatusRecord.setTaskStatus(param.getType());

2
common/src/main/resources/mapper_dao/ProParentTaskDao.xml

@ -14,7 +14,7 @@
</foreach>
</insert>
<select id="findTaskByParentId" resultType="com.ccsens.common.bean.vo.TaskVo$TaskDetail">
<select id="findTaskByParentId" resultType="com.ccsens.common.bean.vo.CTaskVo$TaskDetail">
SELECT
d.id AS detailId,
d.`name`,

2
common/src/main/resources/mapper_dao/ProProjectDao.xml

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.common.persist.dao.ProProjectDao">
<select id="findProjectById" resultType="com.ccsens.common.bean.vo.ProjectVo$ProjectInfo">
<select id="findProjectById" resultType="com.ccsens.common.bean.vo.CProjectVo$ProjectInfo">
SELECT
d.id,
d.`name`,

4
common/src/main/resources/mapper_dao/ProTaskDetailDao.xml

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.common.persist.dao.ProTaskDetailDao">
<resultMap id="queryTask" type="com.ccsens.common.bean.vo.TaskVo$QueryTask">
<resultMap id="queryTask" type="com.ccsens.common.bean.vo.CTaskVo$QueryTask">
<id column="id" property="id"/>
<result column="detailId" property="detailId"/>
<result column="name" property="name"/>
@ -14,7 +14,7 @@
<result column="process" property="process"/>
<result column="skip" property="skip"/>
<result column="skipTaskId" property="skipTaskId"/>
<collection property="panel" ofType="com.ccsens.common.bean.vo.TaskVo$PanelInfo">
<collection property="panel" ofType="com.ccsens.common.bean.vo.CTaskVo$PanelInfo">
<result column="backgroundColor" property="backgroundColor"/>
<result column="borderRadius" property="borderRadius"/>
<result column="border" property="border"/>

2
common/src/main/resources/mapper_dao/ProTaskPluginDao.xml

@ -19,7 +19,7 @@
</foreach>
</insert>
<select id="queryTaskOfPlugin" resultType="com.ccsens.common.bean.vo.TaskVo$TaskPluginInfo">
<select id="queryTaskOfPlugin" resultType="com.ccsens.common.bean.vo.CTaskVo$TaskPluginInfo">
SELECT
tp.plugin_id AS pluginId,
tp.param As param,

Loading…
Cancel
Save