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

修改bean

tall3
zy_Java 4 years ago
parent
0d6d229067
commit
fbc6dab320
10 changed files with 325 additions and 329 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. 6
      common/pom.xml
  2. 14
      common/src/main/java/com/ccsens/common/CommonApplication.java
  3. 46
      common/src/main/java/com/ccsens/common/bean/dto/PluginDto.java
  4. 38
      common/src/main/java/com/ccsens/common/bean/dto/ProjectDto.java
  5. 58
      common/src/main/java/com/ccsens/common/bean/dto/RoleDto.java
  6. 122
      common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java
  7. 64
      common/src/main/java/com/ccsens/common/bean/vo/PluginVo.java
  8. 72
      common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java
  9. 74
      common/src/main/java/com/ccsens/common/bean/vo/RoleVo.java
  10. 160
      common/src/main/java/com/ccsens/common/bean/vo/TaskVo.java

6
common/pom.xml
View File

@ -48,12 +48,12 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <!--<plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<mainClass>com.ccsens.signin.SigninApplication</mainClass> <mainClass>com.ccsens.signin.SigninApplication</mainClass>
<!--<skip>true</skip>--> &lt;!&ndash;<skip>true</skip>&ndash;&gt;
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -62,7 +62,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>

14
common/src/main/java/com/ccsens/common/CommonApplication.java
View File

@ -11,13 +11,13 @@ import org.springframework.scheduling.annotation.EnableAsync;
/** /**
* @author ma * @author ma
*/ */
@MapperScan(basePackages = {"com.ccsens.common.persist.*"}) //@MapperScan(basePackages = {"com.ccsens.common.persist.*"})
@ServletComponentScan //@ServletComponentScan
@EnableAsync //@EnableAsync
//开启断路器功能 ////开启断路器功能
@EnableCircuitBreaker //@EnableCircuitBreaker
@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign") //@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
@SpringBootApplication(scanBasePackages = "com.ccsens") //@SpringBootApplication(scanBasePackages = "com.ccsens")
public class CommonApplication { public class CommonApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(CommonApplication.class,args); SpringApplication.run(CommonApplication.class,args);

46
common/src/main/java/com/ccsens/common/bean/dto/PluginDto.java
View File

@ -1,22 +1,24 @@
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 /**
public class PluginDto { * @author 逗
*/
@Data
@Data public class PluginDto {
@ApiModel("根据插件id查询插件信息入参")
public static class QueryPlugins{ @Data
@NotNull(message = "项目id不能为空") @ApiModel("根据id查看插件")
@ApiModelProperty("插件id") public static class GetPlugin{
private Long pluginId; @NotNull(message = "插件id不能为空")
@ApiModelProperty("插件样式(样式类型 (1一行 2两行 3半屏))") @ApiModelProperty("插件id")
private byte styleType; private Long pluginId;
} @ApiModelProperty("样式类型 (1一行 2两行 3半屏)")
} private int styleType;
}
}

38
common/src/main/java/com/ccsens/common/bean/dto/ProjectDto.java
View File

@ -1,19 +1,19 @@
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 ProjectDto {
@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;
} }
} }

58
common/src/main/java/com/ccsens/common/bean/dto/RoleDto.java
View File

@ -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 RoleDto {
@Data @Data
@ApiModel("查看角色栏展示") @ApiModel("查看角色栏展示")
public static class QueryRole{ 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;
} }
} }

122
common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java
View File

@ -1,61 +1,61 @@
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;
/** /**
* @author 逗 * @author 逗
*/ */
@Data @Data
public class TaskDto { public class TaskDto {
@Data @Data
@ApiModel("查看永久日常任务") @ApiModel("查看永久日常任务")
public static class QueryPermanentGlobalTask{ public static class QueryPermanentGlobalTask{
@NotNull(message = "角色id不能为空") @NotNull(message = "角色id不能为空")
@ApiModelProperty("角色id") @ApiModelProperty("角色id")
private Long roleId; private Long roleId;
} }
@Data @Data
@ApiModel("查看带时间的日常任务") @ApiModel("查看带时间的日常任务")
public static class QueryGlobalTask{ public static class QueryGlobalTask{
@NotNull(message = "角色id不能为空") @NotNull(message = "角色id不能为空")
@ApiModelProperty("角色id") @ApiModelProperty("角色id")
private Long roleId; private Long roleId;
@ApiModelProperty("时间基准点 默认当前") @ApiModelProperty("时间基准点 默认当前")
private Long timeNode = System.currentTimeMillis(); private Long timeNode = System.currentTimeMillis();
@ApiModelProperty("时间基准点 默认天") @ApiModelProperty("时间基准点 默认天")
private int timeUnit = 4; private int timeUnit;
} }
@Data @Data
@ApiModel("查看定期任务") @ApiModel("查看定期任务")
public static class QueryRegularTask{ public static class QueryRegularTask{
@NotNull(message = "角色id不能为空") @NotNull(message = "角色id不能为空")
@ApiModelProperty("角色id") @ApiModelProperty("角色id")
private Long roleId; private Long roleId;
@ApiModelProperty("时间基准点 默认当前") @ApiModelProperty("时间基准点 默认当前")
private Long timeNode = System.currentTimeMillis(); private Long timeNode = System.currentTimeMillis();
@ApiModelProperty("时间基准点 默认天") @ApiModelProperty("时间基准点 默认天")
private int timeUnit; private int timeUnit;
@ApiModelProperty("0向上查找 1向下查找(默认) 下查包含自己，上查不包含") @ApiModelProperty("0向上查找 1向下查找(默认) 下查包含自己，上查不包含")
private int queryType = 1; private int queryType = 1;
@ApiModelProperty("查找颗粒度数量 默认3个") @ApiModelProperty("查找颗粒度数量 默认3个")
private int queryNum = 3; private int queryNum = 3;
} }
@Data @Data
@ApiModel("修改任务状态") @ApiModel("修改任务状态")
public static class UpdateTaskType{ public static class UpdateTaskType{
@NotNull(message = "任务id不能为空") @NotNull(message = "任务id不能为空")
@ApiModelProperty("任务分解id") @ApiModelProperty("任务分解id")
private Long id; private Long id;
@ApiModelProperty("0开始 1暂停 2继续 3完成 默认0") @ApiModelProperty("0开始 1暂停 2继续 3完成 默认0")
private int type; private int type;
} }
} }

64
common/src/main/java/com/ccsens/common/bean/vo/PluginVo.java
View File

@ -1,31 +1,33 @@
package com.ccsens.common.bean.vo; package com.ccsens.common.bean.vo;
import com.fasterxml.jackson.annotation.JsonIgnore; 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; /**
* @author 逗
@Data */
public class PluginVo { @Data
public class PluginVo {
@Data @Data
@ApiModel("根据插件id查询插件信息结果") @ApiModel("插件详情")
public static class QueryPlugins { 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 byte styleType; private int styleType;
@ApiModelProperty("插件样式内容") @ApiModelProperty("插件样式内容")
private String html; private String html;
@ApiModelProperty(" 插件的js功能") @ApiModelProperty("插件的js功能")
private String js; private String js;
} }
}
}

72
common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java
View File

@ -1,40 +1,32 @@
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 javax.validation.constraints.NotNull; /**
* @author AUSU
/** */
* @author AUSU @Data
*/ public class ProjectVo {
@Data @Data
public class ProjectVo { @ApiModel("项目信息")
@Data public static class ProjectInfo{
@ApiModel("项目信息") @ApiModelProperty("项目id")
public static class ProjectInfo{ private Long projectId;
@ApiModelProperty("项目id(任务详情id)") @ApiModelProperty("项目名称")
private Long id; private String name;
@ApiModelProperty("项目名称") }
private String name;
@ApiModelProperty("项目描述") @Data
private String description; public static class SysProject{
@ApiModelProperty("重复频率") @ApiModelProperty("项目id")
private String cycle; private Long id;
@ApiModelProperty("重复频率") @ApiModelProperty("项目名称")
private String planStartTime; private String name;
@ApiModelProperty("重复频率") @ApiModelProperty("开始时间")
private String planDuration; private Long beginTime;
@ApiModelProperty("重复频率") @ApiModelProperty("结束时间")
private String planEndTime; private Long endTime;
@ApiModelProperty("重复频率") }
private String realStartTime; }
@ApiModelProperty("重复频率")
private String realDuration;
@ApiModelProperty("重复频率")
private String realEndTime;
}
}

74
common/src/main/java/com/ccsens/common/bean/vo/RoleVo.java
View File

@ -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 RoleVo {
@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;
} }
} }

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

@ -1,80 +1,80 @@
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 TaskVo {
@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 pluginId; private int pluginId;
@ApiModelProperty("参数") @ApiModelProperty("参数")
private String param; private int 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;
} }
} }

Write Preview
Loading…
Cancel
Save