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

common/pom.xml

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

common/src/main/java/com/ccsens/common/CommonApplication.java

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

common/src/main/java/com/ccsens/common/bean/dto/PluginDto.java

@@ -1,22 +1,24 @@
-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 PluginDto {
-
-
-    @Data
-    @ApiModel("根据插件id查询插件信息入参")
-    public static class QueryPlugins{
-        @NotNull(message = "项目id不能为空")
-        @ApiModelProperty("插件id")
-        private Long pluginId;
-        @ApiModelProperty("插件样式(样式类型 (1一行 2两行 3半屏))")
-        private byte styleType;
-    }
-}
+package com.ccsens.common.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+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;
+    }
+}

common/src/main/java/com/ccsens/common/bean/dto/ProjectDto.java

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

common/src/main/java/com/ccsens/common/bean/dto/RoleDto.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 QueryRole{
-        @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 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;
+    }
+}

common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java

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

common/src/main/java/com/ccsens/common/bean/vo/PluginVo.java

@@ -1,31 +1,33 @@
-package com.ccsens.common.bean.vo;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PluginVo {
-
-    @Data
-    @ApiModel("根据插件id查询插件信息结果")
-    public static class QueryPlugins {
-        @ApiModelProperty("插件id")
-        private Long id;
-        @ApiModelProperty("插件名称")
-        private String name;
-        @ApiModelProperty("插件简介")
-        private String intro;
-        @ApiModelProperty(" 插件版本")
-        private String  version;
-        @ApiModelProperty("样式类型 (1一行 2两行 3半屏)")
-        private byte 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 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;
+    }
+
+
+}

common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java

@@ -1,40 +1,32 @@
-package com.ccsens.common.bean.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @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 String planStartTime;
-        @ApiModelProperty("重复频率")
-        private String planDuration;
-        @ApiModelProperty("重复频率")
-        private String planEndTime;
-        @ApiModelProperty("重复频率")
-        private String realStartTime;
-        @ApiModelProperty("重复频率")
-        private String realDuration;
-        @ApiModelProperty("重复频率")
-        private String realEndTime;
-
-
-    }
-}
+package com.ccsens.common.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author AUSU
+ */
+@Data
+public class ProjectVo {
+    @Data
+    @ApiModel("项目信息")
+    public static class ProjectInfo{
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("项目名称")
+        private String name;
+    }
+
+    @Data
+    public static class SysProject{
+        @ApiModelProperty("项目id")
+        private Long id;
+        @ApiModelProperty("项目名称")
+        private String name;
+        @ApiModelProperty("开始时间")
+        private Long beginTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+    }
+}

common/src/main/java/com/ccsens/common/bean/vo/RoleVo.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 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;
+    }
+}

common/src/main/java/com/ccsens/common/bean/vo/TaskVo.java

@@ -1,80 +1,80 @@
-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 pluginId;
-        @ApiModelProperty("参数")
-        private String param;
-        @ApiModelProperty("行")
-        private int row;
-        @ApiModelProperty("列")
-        private int col;
-        @ApiModelProperty("跨行")
-        private int rowspan;
-        @ApiModelProperty("跨列")
-        private int colspan;
-    }
-}
+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 int pluginId;
+        @ApiModelProperty("参数")
+        private int param;
+        @ApiModelProperty("行")
+        private int row;
+        @ApiModelProperty("列")
+        private int col;
+        @ApiModelProperty("跨行")
+        private int rowspan;
+        @ApiModelProperty("跨列")
+        private int colspan;
+    }
+}