修改bean

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.*"})
+//@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 static void main(String[] args) {
         SpringApplication.run(CommonApplication.class,args);

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

@@ -6,17 +6,19 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
+/**
+ * @author 逗
+ */
 @Data
 public class PluginDto {
 
-
     @Data
-    @ApiModel("根据插件id查询插件信息入参")
+    @ApiModel("根据id查看插件")
-    public static class QueryPlugins{
+    public static class GetPlugin{
-        @NotNull(message = "项目id不能为空")
+        @NotNull(message = "插件id不能为空")
         @ApiModelProperty("插件id")
         private Long pluginId;
-        @ApiModelProperty("插件样式(样式类型 (1一行 2两行 3半屏))")
+        @ApiModelProperty("样式类型 (1一行 2两行 3半屏)")
-        private byte styleType;
+        private int styleType;
     }
 }

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

@@ -11,14 +11,14 @@ import java.util.List;
 public class RoleDto {
     @Data
     @ApiModel("查看角色栏展示")
-    public static class QueryRole{
+    public static class QueryRoleById{
         @NotNull(message = "项目id不能为空")
         @ApiModelProperty("项目id")
         private Long projectId;
     }
 
     @Data
-    @ApiModel("查看永久日常任务")
+    @ApiModel("修改角色栏展示")
     public static class UpdateRoleShow{
         @NotNull(message = "项目id不能为空")
         @ApiModelProperty("项目id")

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

@@ -29,7 +29,7 @@ public class TaskDto {
         @ApiModelProperty("时间基准点 默认当前")
         private Long timeNode = System.currentTimeMillis();
         @ApiModelProperty("时间基准点 默认天")
-        private int timeUnit = 4;
+        private int timeUnit;
     }
 
     @Data

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

@@ -1,18 +1,18 @@
 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;
 
+/**
+ * @author 逗
+ */
 @Data
 public class PluginVo {
-
     @Data
-    @ApiModel("根据插件id查询插件信息结果")
+    @ApiModel("插件详情")
-    public static class QueryPlugins {
+    public static class PluginInfo{
         @ApiModelProperty("插件id")
         private Long id;
         @ApiModelProperty("插件名称")
@@ -21,11 +21,13 @@ public class PluginVo {
         private String intro;
         @ApiModelProperty("插件版本")
         private String version;
-        @ApiModelProperty("样式类型 (1一行 2两行 3半屏)")
+        @ApiModelProperty("插件样式类型 1一行 2两行 3半屏")
-        private byte styleType;
+        private int styleType;
         @ApiModelProperty("插件样式内容")
         private String html;
         @ApiModelProperty("插件的js功能")
         private String js;
     }
+
+
 }

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

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * @author AUSU
  */
@@ -14,27 +12,21 @@ public class ProjectVo {
     @Data
     @ApiModel("项目信息")
     public static class ProjectInfo{
-        @ApiModelProperty("项目id(任务详情id)")
+        @ApiModelProperty("项目id")
-        private Long id;
+        private Long projectId;
         @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;
-
 
+    @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

@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 public class RoleVo {
     @Data
-    @ApiModel("查看定期任务返回值")
+    @ApiModel("查看角色栏展示的角色信息")
     public static class QueryRole {
         @ApiModelProperty("展示的角色信息")
         private List<RoleInfo> visibleList;
@@ -21,7 +21,7 @@ public class RoleVo {
     }
 
     @Data
-    @ApiModel("查看定期任务返回值")
+    @ApiModel("角色信息")
     public static class RoleInfo {
         @ApiModelProperty("角色id")
         private Long id;

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

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