ma
4 years ago
24 changed files with 450 additions and 453 deletions
@ -1,50 +1,50 @@ |
|||||
package com.ccsens.common.bean.dto; |
package com.ccsens.common.bean.dto; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
import javax.validation.constraints.Min; |
import javax.validation.constraints.Min; |
||||
import javax.validation.constraints.NotNull; |
import javax.validation.constraints.NotNull; |
||||
|
|
||||
/** |
/** |
||||
* @author 逗 |
* @author 逗 |
||||
*/ |
*/ |
||||
@Data |
@Data |
||||
public class PluginDto { |
public class CPluginDto { |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("根据id查看插件") |
@ApiModel("根据id查看插件") |
||||
public static class GetPlugin{ |
public static class GetPlugin{ |
||||
@NotNull(message = "插件id不能为空") |
@NotNull(message = "插件id不能为空") |
||||
@ApiModelProperty("插件id") |
@ApiModelProperty("插件id") |
||||
private Long pluginId; |
private Long pluginId; |
||||
@ApiModelProperty("样式类型 (1一行 2两行 3半屏)") |
@ApiModelProperty("样式类型 (1一行 2两行 3半屏)") |
||||
private int styleType; |
private int styleType; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("配置任务插件信息") |
@ApiModel("配置任务插件信息") |
||||
public static class UpdateTaskPlugin{ |
public static class UpdateTaskPlugin{ |
||||
@NotNull(message = "任务详情id不能为空") |
@NotNull(message = "任务详情id不能为空") |
||||
@ApiModelProperty("任务详情id") |
@ApiModelProperty("任务详情id") |
||||
private Long taskDetailId; |
private Long taskDetailId; |
||||
@NotNull(message = "插件id不能为空") |
@NotNull(message = "插件id不能为空") |
||||
@ApiModelProperty("插件id") |
@ApiModelProperty("插件id") |
||||
private Long pluginId; |
private Long pluginId; |
||||
@ApiModelProperty("参数") |
@ApiModelProperty("参数") |
||||
private String param; |
private String param; |
||||
@Min(1) |
@Min(1) |
||||
@ApiModelProperty("行") |
@ApiModelProperty("行") |
||||
private int row = 1; |
private int row = 1; |
||||
@Min(1) |
@Min(1) |
||||
@ApiModelProperty("列") |
@ApiModelProperty("列") |
||||
private int col = 1; |
private int col = 1; |
||||
@Min(1) |
@Min(1) |
||||
@ApiModelProperty("跨行") |
@ApiModelProperty("跨行") |
||||
private int rowspan = 1; |
private int rowspan = 1; |
||||
@Min(1) |
@Min(1) |
||||
@ApiModelProperty("跨列") |
@ApiModelProperty("跨列") |
||||
private int colspan = 1; |
private int colspan = 1; |
||||
} |
} |
||||
} |
} |
||||
@ -1,29 +1,29 @@ |
|||||
package com.ccsens.common.bean.dto; |
package com.ccsens.common.bean.dto; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
import javax.validation.constraints.NotNull; |
import javax.validation.constraints.NotNull; |
||||
|
|
||||
@Data |
@Data |
||||
public class ProjectDto { |
public class CProjectDto { |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("根据id查找项目信息") |
@ApiModel("根据id查找项目信息") |
||||
public static class ProjectById { |
public static class ProjectById { |
||||
@NotNull(message = "请选择项目") |
@NotNull(message = "请选择项目") |
||||
@ApiModelProperty("项目id") |
@ApiModelProperty("项目id") |
||||
private Long projectId; |
private Long projectId; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("根据模板复制项目") |
@ApiModel("根据模板复制项目") |
||||
public static class CopyProject{ |
public static class CopyProject{ |
||||
@NotNull(message = "请选择要复制得项目") |
@NotNull(message = "请选择要复制得项目") |
||||
@ApiModelProperty("项目id") |
@ApiModelProperty("项目id") |
||||
private Long projectId; |
private Long projectId; |
||||
@ApiModelProperty("新项目名字") |
@ApiModelProperty("新项目名字") |
||||
private String projectName; |
private String projectName; |
||||
} |
} |
||||
} |
} |
||||
@ -1,29 +1,29 @@ |
|||||
package com.ccsens.common.bean.dto; |
package com.ccsens.common.bean.dto; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
import javax.validation.constraints.NotNull; |
import javax.validation.constraints.NotNull; |
||||
import java.util.List; |
import java.util.List; |
||||
|
|
||||
@Data |
@Data |
||||
public class RoleDto { |
public class CRoleDto { |
||||
@Data |
@Data |
||||
@ApiModel("查看角色栏展示") |
@ApiModel("查看角色栏展示") |
||||
public static class QueryRoleById{ |
public static class QueryRoleById{ |
||||
@NotNull(message = "项目id不能为空") |
@NotNull(message = "项目id不能为空") |
||||
@ApiModelProperty("项目id") |
@ApiModelProperty("项目id") |
||||
private Long projectId; |
private Long projectId; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("修改角色栏展示") |
@ApiModel("修改角色栏展示") |
||||
public static class UpdateRoleShow{ |
public static class UpdateRoleShow{ |
||||
@NotNull(message = "项目id不能为空") |
@NotNull(message = "项目id不能为空") |
||||
@ApiModelProperty("项目id") |
@ApiModelProperty("项目id") |
||||
private Long projectId; |
private Long projectId; |
||||
@ApiModelProperty("角色id") |
@ApiModelProperty("角色id") |
||||
private List<Long> roleIds; |
private List<Long> roleIds; |
||||
} |
} |
||||
} |
} |
||||
@ -1,33 +1,33 @@ |
|||||
package com.ccsens.common.bean.vo; |
package com.ccsens.common.bean.vo; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
|
|
||||
/** |
/** |
||||
* @author 逗 |
* @author 逗 |
||||
*/ |
*/ |
||||
@Data |
@Data |
||||
public class PluginVo { |
public class CPluginVo { |
||||
@Data |
@Data |
||||
@ApiModel("插件详情") |
@ApiModel("插件详情") |
||||
public static class PluginInfo{ |
public static class PluginInfo{ |
||||
@ApiModelProperty("插件id") |
@ApiModelProperty("插件id") |
||||
private Long id; |
private Long id; |
||||
@ApiModelProperty("插件名称") |
@ApiModelProperty("插件名称") |
||||
private String name; |
private String name; |
||||
@ApiModelProperty("插件简介") |
@ApiModelProperty("插件简介") |
||||
private String intro; |
private String intro; |
||||
@ApiModelProperty("插件版本") |
@ApiModelProperty("插件版本") |
||||
private String version; |
private String version; |
||||
@ApiModelProperty("插件样式类型 1一行 2两行 3半屏") |
@ApiModelProperty("插件样式类型 1一行 2两行 3半屏") |
||||
private int styleType; |
private int styleType; |
||||
@ApiModelProperty("插件样式内容") |
@ApiModelProperty("插件样式内容") |
||||
private String html; |
private String html; |
||||
@ApiModelProperty("插件的js功能") |
@ApiModelProperty("插件的js功能") |
||||
private String js; |
private String js; |
||||
} |
} |
||||
|
|
||||
|
|
||||
} |
} |
||||
@ -1,84 +1,84 @@ |
|||||
package com.ccsens.common.bean.vo; |
package com.ccsens.common.bean.vo; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
import java.util.List; |
import java.util.List; |
||||
|
|
||||
/** |
/** |
||||
* @author AUSU |
* @author AUSU |
||||
*/ |
*/ |
||||
@Data |
@Data |
||||
public class ProjectVo { |
public class CProjectVo { |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("项目信息") |
@ApiModel("项目信息") |
||||
public static class ProjectInfo{ |
public static class ProjectInfo{ |
||||
@ApiModelProperty("项目id(任务详情id)") |
@ApiModelProperty("项目id(任务详情id)") |
||||
private Long id; |
private Long id; |
||||
@ApiModelProperty("项目名称") |
@ApiModelProperty("项目名称") |
||||
private String name; |
private String name; |
||||
@ApiModelProperty("项目描述") |
@ApiModelProperty("项目描述") |
||||
private String description; |
private String description; |
||||
@ApiModelProperty("重复频率") |
@ApiModelProperty("重复频率") |
||||
private String cycle; |
private String cycle; |
||||
@ApiModelProperty("计划开始时间") |
@ApiModelProperty("计划开始时间") |
||||
private Long planStartTime; |
private Long planStartTime; |
||||
@ApiModelProperty("计划时长") |
@ApiModelProperty("计划时长") |
||||
private Long planDuration; |
private Long planDuration; |
||||
@ApiModelProperty("计划结束时间") |
@ApiModelProperty("计划结束时间") |
||||
private Long planEndTime; |
private Long planEndTime; |
||||
@ApiModelProperty("真实开始时间") |
@ApiModelProperty("真实开始时间") |
||||
private Long realStartTime; |
private Long realStartTime; |
||||
@ApiModelProperty("真实时长") |
@ApiModelProperty("真实时长") |
||||
private Long realDuration; |
private Long realDuration; |
||||
@ApiModelProperty("真实结束时间") |
@ApiModelProperty("真实结束时间") |
||||
private Long realEndTime; |
private Long realEndTime; |
||||
|
|
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
public static class SysProject{ |
public static class SysProject{ |
||||
@ApiModelProperty("项目id") |
@ApiModelProperty("项目id") |
||||
private Long id; |
private Long id; |
||||
@ApiModelProperty("项目名称") |
@ApiModelProperty("项目名称") |
||||
private String name; |
private String name; |
||||
@ApiModelProperty("开始时间") |
@ApiModelProperty("开始时间") |
||||
private Long beginTime; |
private Long beginTime; |
||||
@ApiModelProperty("结束时间") |
@ApiModelProperty("结束时间") |
||||
private Long endTime; |
private Long endTime; |
||||
} |
} |
||||
|
|
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("复制的项目信息") |
@ApiModel("复制的项目信息") |
||||
public static class CopyProjectInfo{ |
public static class CopyProjectInfo{ |
||||
@ApiModelProperty("项目id") |
@ApiModelProperty("项目id") |
||||
private Long id; |
private Long id; |
||||
// @ApiModelProperty("任务详情")
|
// @ApiModelProperty("任务详情")
|
||||
// private List<ProjectVo.TaskDetail> taskDetails;
|
// private List<ProjectVo.TaskDetail> taskDetails;
|
||||
} |
} |
||||
@Data |
@Data |
||||
@ApiModel("任务详情") |
@ApiModel("任务详情") |
||||
public static class TaskDetail{ |
public static class TaskDetail{ |
||||
@ApiModelProperty("任务详情id") |
@ApiModelProperty("任务详情id") |
||||
private Long taskDetailId; |
private Long taskDetailId; |
||||
@ApiModelProperty("任务详情名称") |
@ApiModelProperty("任务详情名称") |
||||
private String taskDetailName; |
private String taskDetailName; |
||||
@ApiModelProperty("任务等级") |
@ApiModelProperty("任务等级") |
||||
private Byte taskDetailLevel; |
private Byte taskDetailLevel; |
||||
@ApiModelProperty("任务详情下的分解任务") |
@ApiModelProperty("任务详情下的分解任务") |
||||
private List<ProjectVo.TaskSub> taskSubList; |
private List<CProjectVo.TaskSub> taskSubList; |
||||
} |
} |
||||
@Data |
@Data |
||||
@ApiModel("分解任务") |
@ApiModel("分解任务") |
||||
public static class TaskSub{ |
public static class TaskSub{ |
||||
@ApiModelProperty("分解任务id") |
@ApiModelProperty("分解任务id") |
||||
private Long taskSubId; |
private Long taskSubId; |
||||
@ApiModelProperty("分解任务开始时间") |
@ApiModelProperty("分解任务开始时间") |
||||
private Long startTime; |
private Long startTime; |
||||
@ApiModelProperty("分解任务结束时间") |
@ApiModelProperty("分解任务结束时间") |
||||
private Long endTime; |
private Long endTime; |
||||
} |
} |
||||
} |
} |
||||
@ -1,37 +1,37 @@ |
|||||
package com.ccsens.common.bean.vo; |
package com.ccsens.common.bean.vo; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
import java.util.List; |
import java.util.List; |
||||
|
|
||||
/** |
/** |
||||
* @author 逗 |
* @author 逗 |
||||
*/ |
*/ |
||||
@Data |
@Data |
||||
public class RoleVo { |
public class CRoleVo { |
||||
@Data |
@Data |
||||
@ApiModel("查看角色栏展示的角色信息") |
@ApiModel("查看角色栏展示的角色信息") |
||||
public static class QueryRole { |
public static class QueryRole { |
||||
@ApiModelProperty("展示的角色信息") |
@ApiModelProperty("展示的角色信息") |
||||
private List<RoleInfo> visibleList; |
private List<RoleInfo> visibleList; |
||||
@ApiModelProperty("不展示的角色信息") |
@ApiModelProperty("不展示的角色信息") |
||||
private List<RoleInfo> invisibleList; |
private List<RoleInfo> invisibleList; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("角色信息") |
@ApiModel("角色信息") |
||||
public static class RoleInfo { |
public static class RoleInfo { |
||||
@ApiModelProperty("角色id") |
@ApiModelProperty("角色id") |
||||
private Long id; |
private Long id; |
||||
@ApiModelProperty("是否是项目经理 0否 1是") |
@ApiModelProperty("是否是项目经理 0否 1是") |
||||
private Long pm; |
private Long pm; |
||||
@ApiModelProperty("是否是自己所属的角色 0否 1是") |
@ApiModelProperty("是否是自己所属的角色 0否 1是") |
||||
private Long mine; |
private Long mine; |
||||
@ApiModelProperty("角色名") |
@ApiModelProperty("角色名") |
||||
private String name; |
private String name; |
||||
@ApiModelProperty("排序") |
@ApiModelProperty("排序") |
||||
private Long sequence; |
private Long sequence; |
||||
} |
} |
||||
} |
} |
||||
@ -1,101 +1,101 @@ |
|||||
package com.ccsens.common.bean.vo; |
package com.ccsens.common.bean.vo; |
||||
|
|
||||
import io.swagger.annotations.ApiModel; |
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
import lombok.Data; |
||||
|
|
||||
import java.util.List; |
import java.util.List; |
||||
|
|
||||
|
|
||||
@Data |
@Data |
||||
public class TaskVo { |
public class CTaskVo { |
||||
@Data |
@Data |
||||
@ApiModel("查看定期任务返回值") |
@ApiModel("查看定期任务返回值") |
||||
public static class QueryTask{ |
public static class QueryTask{ |
||||
@ApiModelProperty("任务id（任务分解id）") |
@ApiModelProperty("任务id（任务分解id）") |
||||
private Long id; |
private Long id; |
||||
@ApiModelProperty("详情id") |
@ApiModelProperty("详情id") |
||||
private Long detailId; |
private Long detailId; |
||||
@ApiModelProperty("任务名") |
@ApiModelProperty("任务名") |
||||
private String name; |
private String name; |
||||
@ApiModelProperty("任务详情") |
@ApiModelProperty("任务详情") |
||||
private String description; |
private String description; |
||||
@ApiModelProperty("计划开始时间") |
@ApiModelProperty("计划开始时间") |
||||
private Long planStart; |
private Long planStart; |
||||
@ApiModelProperty("计划时长") |
@ApiModelProperty("计划时长") |
||||
private Long planDuration; |
private Long planDuration; |
||||
@ApiModelProperty("实际开始时间") |
@ApiModelProperty("实际开始时间") |
||||
private Long realStart; |
private Long realStart; |
||||
@ApiModelProperty("实际时长") |
@ApiModelProperty("实际时长") |
||||
private Long realDuration; |
private Long realDuration; |
||||
@ApiModelProperty("任务状态 0未开始 1进行中 2暂停中 3已完成") |
@ApiModelProperty("任务状态 0未开始 1进行中 2暂停中 3已完成") |
||||
private int process; |
private int process; |
||||
@ApiModelProperty("任务流转策略 -1不跳转 0直接跳转 如果是其他正整数 就是多少毫秒后跳转 ") |
@ApiModelProperty("任务流转策略 -1不跳转 0直接跳转 如果是其他正整数 就是多少毫秒后跳转 ") |
||||
private Long skip; |
private Long skip; |
||||
@ApiModelProperty("跳转的任务id") |
@ApiModelProperty("跳转的任务id") |
||||
private Long skipTaskId; |
private Long skipTaskId; |
||||
@ApiModelProperty("任务面板") |
@ApiModelProperty("任务面板") |
||||
private PanelInfo panel; |
private PanelInfo panel; |
||||
@ApiModelProperty("插件") |
@ApiModelProperty("插件") |
||||
private List<List<TaskPluginInfo>> plugins; |
private List<List<TaskPluginInfo>> plugins; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("任务面板信息") |
@ApiModel("任务面板信息") |
||||
public static class PanelInfo{ |
public static class PanelInfo{ |
||||
@ApiModelProperty("背景色") |
@ApiModelProperty("背景色") |
||||
private String backgroundColor; |
private String backgroundColor; |
||||
@ApiModelProperty("圆角") |
@ApiModelProperty("圆角") |
||||
private String borderRadius; |
private String borderRadius; |
||||
@ApiModelProperty("边框") |
@ApiModelProperty("边框") |
||||
private String border; |
private String border; |
||||
@ApiModelProperty("阴影") |
@ApiModelProperty("阴影") |
||||
private String shadow; |
private String shadow; |
||||
@ApiModelProperty("宽") |
@ApiModelProperty("宽") |
||||
private String width; |
private String width; |
||||
@ApiModelProperty("高") |
@ApiModelProperty("高") |
||||
private String height; |
private String height; |
||||
@ApiModelProperty("行") |
@ApiModelProperty("行") |
||||
private int row; |
private int row; |
||||
@ApiModelProperty("列") |
@ApiModelProperty("列") |
||||
private int col; |
private int col; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("任务下的插件信息") |
@ApiModel("任务下的插件信息") |
||||
public static class TaskPluginInfo{ |
public static class TaskPluginInfo{ |
||||
@ApiModelProperty("插件任务关联id") |
@ApiModelProperty("插件任务关联id") |
||||
private Long pluginTaskId; |
private Long pluginTaskId; |
||||
@ApiModelProperty("插件id") |
@ApiModelProperty("插件id") |
||||
private Long pluginId; |
private Long pluginId; |
||||
@ApiModelProperty("参数") |
@ApiModelProperty("参数") |
||||
private String param; |
private String param; |
||||
@ApiModelProperty("行") |
@ApiModelProperty("行") |
||||
private int row; |
private int row; |
||||
@ApiModelProperty("列") |
@ApiModelProperty("列") |
||||
private int col; |
private int col; |
||||
@ApiModelProperty("跨行") |
@ApiModelProperty("跨行") |
||||
private int rowspan; |
private int rowspan; |
||||
@ApiModelProperty("跨列") |
@ApiModelProperty("跨列") |
||||
private int colspan; |
private int colspan; |
||||
} |
} |
||||
|
|
||||
@Data |
@Data |
||||
@ApiModel("任务详情") |
@ApiModel("任务详情") |
||||
public static class TaskDetail{ |
public static class TaskDetail{ |
||||
@ApiModelProperty("任务详情id") |
@ApiModelProperty("任务详情id") |
||||
private Long detailId; |
private Long detailId; |
||||
@ApiModelProperty("任务名称") |
@ApiModelProperty("任务名称") |
||||
private String name; |
private String name; |
||||
@ApiModelProperty("任务描述") |
@ApiModelProperty("任务描述") |
||||
private String description; |
private String description; |
||||
@ApiModelProperty("重复频率") |
@ApiModelProperty("重复频率") |
||||
private String cycle; |
private String cycle; |
||||
//以下是任务关系表
|
//以下是任务关系表
|
||||
@ApiModelProperty("任务关系表id") |
@ApiModelProperty("任务关系表id") |
||||
private Long parentTaskId; |
private Long parentTaskId; |
||||
@ApiModelProperty("父级任务id") |
@ApiModelProperty("父级任务id") |
||||
private Long parentTaskDetailId; |
private Long parentTaskDetailId; |
||||
|
|
||||
} |
} |
||||
} |
} |
||||
@ -1,11 +1,11 @@ |
|||||
package com.ccsens.common.service; |
package com.ccsens.common.service; |
||||
|
|
||||
import com.ccsens.common.bean.dto.PluginDto; |
import com.ccsens.common.bean.dto.CPluginDto; |
||||
|
|
||||
public interface IPluginService { |
public interface IPluginService { |
||||
/** |
/** |
||||
* 配置任务插件关联信息 |
* 配置任务插件关联信息 |
||||
*/ |
*/ |
||||
void updateTaskPlugin(PluginDto.UpdateTaskPlugin updateTaskPlugin); |
void updateTaskPlugin(CPluginDto.UpdateTaskPlugin updateTaskPlugin); |
||||
|
|
||||
} |
} |
||||
|
|||||
@ -1,11 +1,11 @@ |
|||||
package com.ccsens.common.service; |
package com.ccsens.common.service; |
||||
|
|
||||
import com.ccsens.common.bean.dto.RoleDto; |
import com.ccsens.common.bean.dto.CRoleDto; |
||||
import com.ccsens.common.bean.vo.RoleVo; |
import com.ccsens.common.bean.vo.CRoleVo; |
||||
|
|
||||
public interface IProRoleService { |
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); |
||||
} |
} |
||||
|
|||||
Loading…
Reference in new issue