Merge branch 'master' of https://gitee.com/ccsens_s/ccsenscloud

tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java

@@ -2,6 +2,7 @@ package com.ccsens.tall.bean.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,8 +10,7 @@ import java.util.List;
 
 public class DeliverDto {
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class CheckDeliver{
         @ApiModelProperty("交付物Id")
         private Long deliverId;
@@ -23,8 +23,7 @@ public class DeliverDto {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class UploadDeliver{
         @ApiModelProperty("交付物Id")
         private Long deliverId;
@@ -38,8 +37,7 @@ public class DeliverDto {
         private List<fileInfo> fileInfo;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class fileInfo{
         @ApiModelProperty("文件ID")
         private Long id;

tall/src/main/java/com/ccsens/tall/bean/dto/HardwareDto.java

@@ -9,8 +9,7 @@ import lombok.Setter;
 @Data
 public class HardwareDto {
 
-    @Setter
-    @Getter
+    @Data
     @ApiModel
     public class HardwareInfo{
         @ApiModelProperty("设备编号")

tall/src/main/java/com/ccsens/tall/bean/dto/MemberRoleDto.java

@@ -3,11 +3,11 @@ package com.ccsens.tall.bean.dto;
 import com.ccsens.tall.bean.po.ProMemberRole;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
-@Getter
-@Setter
+@Data
 public class MemberRoleDto extends ProMemberRole {
     private int currentIndex;
 
@@ -15,8 +15,7 @@ public class MemberRoleDto extends ProMemberRole {
         currentIndex++;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class ProMemberRoleDto{
         @ApiModelProperty("被修改的角色的id")
@@ -25,8 +24,7 @@ public class MemberRoleDto extends ProMemberRole {
         private String name;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class RoleId{
         @ApiModelProperty("角色的id")

tall/src/main/java/com/ccsens/tall/bean/dto/MessageDto.java

@@ -2,14 +2,14 @@ package com.ccsens.tall.bean.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
 
 public class MessageDto {
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class AckMessage{
         @ApiModelProperty("项目Id")
@@ -20,8 +20,7 @@ public class MessageDto {
         private Long msgId;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class HasReadMessage{
         @NotNull(message = "projectId is required.")
         private Long projectId;
@@ -29,8 +28,7 @@ public class MessageDto {
         private Long msgId;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class UserMessage{
         @NotNull(message = "unikey is required.")
         private String unikey;
@@ -40,8 +38,7 @@ public class MessageDto {
         private Long[] receivers;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class NodeMessage{
         @NotNull(message = "unikey is required.")
         private String unikey;
@@ -52,8 +49,7 @@ public class MessageDto {
         private Long msgId; //对哪个消息的评论
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class AuthMessage {
         @ApiModelProperty("WebSocket返回的连接Id")

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

@@ -1,72 +0,0 @@
-package com.ccsens.tall.bean.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-public class PluginDto {
-    @Getter
-    @Setter
-    @ApiModel
-    public static class BatchDevice{
-        private String no;
-        private String name;
-        private String seat;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class __BatchSetting{
-        @ApiModelProperty("老化总时长(milltimes)")
-        private String totalDuration;
-        @ApiModelProperty("电机列表")
-        private List<BatchDevice> devices;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class BatchSetting{
-        @ApiModelProperty("批次Id")
-        private Long roleId;
-        @ApiModelProperty("机柜Id")
-        private Long cubeId;
-        @ApiModelProperty("批次设置")
-        private __BatchSetting batchSetting;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class __TaskSetting{
-        @ApiModelProperty("转速")
-        private BigDecimal speed;
-        @ApiModelProperty("转速阈值1")
-        private BigDecimal speedThreshold1;
-        @ApiModelProperty("转速阈值2")
-        private BigDecimal speedThreshold2;
-        @ApiModelProperty("转速阈值3")
-        private BigDecimal speedThreshold3;
-        @ApiModelProperty("温度阈值1")
-        private BigDecimal temperatureThreshold1;
-        @ApiModelProperty("温度阈值2")
-        private BigDecimal temperatureThreshold2;
-        @ApiModelProperty("温度阈值3")
-        private BigDecimal temperatureThreshold3;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class TaskSetting{
-        @ApiModelProperty("任务Id")
-        private Long taskId;
-        @ApiModelProperty("任务设置")
-        private __TaskSetting taskSetting;
-    }
-}

tall/src/main/java/com/ccsens/tall/bean/dto/ProTaskDto.java

@@ -1,15 +0,0 @@
-package com.ccsens.tall.bean.dto;
-
-import com.ccsens.tall.bean.po.ProTaskSubTime;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class ProTaskDto extends ProTaskSubTime {
-    private int currentIndex;
-
-    public void incrementCurrentIndex(){
-        currentIndex++;
-    }
-}

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

@@ -2,12 +2,12 @@ package com.ccsens.tall.bean.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 public class ProjectDto {
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class RoleInfoDto{
         @Getter
@@ -26,8 +26,7 @@ public class ProjectDto {
         private __RoleInfo role;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class TaskInfoDto{
         @Getter
@@ -46,16 +45,14 @@ public class ProjectDto {
         private __TaskInfo task;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class ProjectIdDto{
         @ApiModelProperty("根据哪个项目拷贝")
         private Long projectId;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class ProjectInfoDto{
         @ApiModelProperty("被修改的项目的id")

tall/src/main/java/com/ccsens/tall/bean/dto/Spider/ChuangYeFuWuXuQiu.java

@@ -1,13 +0,0 @@
-package com.ccsens.tall.bean.dto.Spider;
-
-import lombok.Data;
-
-@Data
-public class ChuangYeFuWuXuQiu {
-    private String muDi;
-    private String bingGouXuQiu;
-    private String zhaiQuanRongZiXuQiu;
-    private String zhaiQuanRongZiJinE;
-    private String guQuanRongZiXuQiu;
-    private String guQuanRongZiJinE;
-}

tall/src/main/java/com/ccsens/tall/bean/dto/Spider/GuDongXinXi.java

@@ -1,31 +0,0 @@
-package com.ccsens.tall.bean.dto.Spider;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Data
-public class GuDongXinXi {
-    private String isGuQuanRongZi;
-    private List<guQuanRongZi> guQuanRongZis;
-    private String isZhaiQuanRongZi;
-    private List<zhaiQuanRongZi> zhaiQuanRongZis;
-    private String xianJieDuan;
-
-    @Getter
-    @Setter
-    public static class guQuanRongZi{
-        private String touZiRen;
-        private String rongZiJinE;
-        private String touZiTime;//投资时间
-    }
-
-    @Getter
-    @Setter
-    public static class zhaiQuanRongZi{
-        private String chuJieFang;
-        private String rongZiJinE;
-    }
-}

tall/src/main/java/com/ccsens/tall/bean/dto/Spider/HeXinTuanDui.java

@@ -1,15 +0,0 @@
-package com.ccsens.tall.bean.dto.Spider;
-
-import lombok.Data;
-
-@Data
-public class HeXinTuanDui {
-    private String name;
-    private String sex;
-    private String birthday;
-    private String zhiWei;
-    private String zuiGaoXueLi;
-    private String isLiuXueJingLi;
-    private String isYuanShi;
-    private String phone;
-}

tall/src/main/java/com/ccsens/tall/bean/dto/Spider/JiBenXinXi.java

@@ -1,45 +0,0 @@
-package com.ccsens.tall.bean.dto.Spider;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Data
-public  class JiBenXinXi {
-    private String name;
-    private String xinYongDaiMa;
-    private String hangYeLingYu;
-    private String tuiJianDanWei;
-    private String isFuHuaQi;
-    private String isKeJiYuan;
-    private String isZhongChuang;
-    private String zhuCeZiBen;
-    private String diZhi;
-    private info faDing;
-    private info lianXiRen;
-    private String isKongGuQiYe;
-    private String isXinSanBan;
-    private String isGaoXin;
-    private List<zhuanLi> zhuanLis;
-
-    @Getter
-    @Setter
-    public static class zhuanLi{
-        private String zhuanLiName;
-        private String zhuanLiType;
-        private String huoQuFangShi;
-        private String zhuanLiHao;
-        private String huoQuTime;
-    }
-
-    @Getter
-    @Setter
-    public static class info{
-        private String name;
-        private String phone;
-        private String mail;
-    }
-
-}

tall/src/main/java/com/ccsens/tall/bean/dto/Spider/ShangYeJiHuaShu.java

@@ -1,10 +0,0 @@
-package com.ccsens.tall.bean.dto.Spider;
-
-import lombok.Data;
-
-@Data
-public class ShangYeJiHuaShu {
-    private String caiSaiXiangMuName;
-    private String yingYeShouRu;
-    private String liRuiZouE;
-}

tall/src/main/java/com/ccsens/tall/bean/dto/SpiderDto.java

@@ -1,86 +0,0 @@
-package com.ccsens.tall.bean.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-public class SpiderDto {
-    @Getter
-    @Setter
-    @ApiModel
-    public static class SpiderHtmlList{
-        private List<SpiderHtml> spiderHtmlList;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class SpiderList{
-        private List<Spider> spiderList;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class Recommend {
-        @ApiModelProperty("企业名称")
-        private Long id;
-        @ApiModelProperty("推荐公司")
-        private String Recommend;
-    }
-    @Getter
-    @Setter
-    @ApiModel
-    public static class RecommendList {
-        private List<Recommend> Recommends;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class SpiderHtml{
-        @ApiModelProperty("企业名称")
-        private String name;
-        @ApiModelProperty("系统用的id")
-        private Long id;
-        @ApiModelProperty("")
-        private String infor;
-        @ApiModelProperty("")
-        private String partner;
-        @ApiModelProperty("")
-        private String team;
-        @ApiModelProperty("")
-        private String plan;
-        @ApiModelProperty("")
-        private String jinrong;
-        @ApiModelProperty("")
-        private String supply;
-        @ApiModelProperty("")
-        private String confirm;
-    }
-
-    @Getter
-    @Setter
-    @ApiModel
-    public static class Spider{
-        @ApiModelProperty("系统用的id")
-        private Long id;
-        @ApiModelProperty("")
-        private String company;
-        @ApiModelProperty("")
-        private String city;
-        @ApiModelProperty("")
-        private String industry;
-        @ApiModelProperty("")
-        private String group;
-        @ApiModelProperty("")
-        private String status;
-        @ApiModelProperty("")
-        private String project;
-        @ApiModelProperty("")
-        private String href;
-    }
-}

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

@@ -2,6 +2,7 @@ package com.ccsens.tall.bean.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,12 +10,11 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
-
+@Data
 public class TaskDto {
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class AddTask {
         @ApiModelProperty("关联项目Id")
         private Long projectId;
@@ -41,8 +41,7 @@ public class TaskDto {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class ChangeTaskDuration{
         @ApiModelProperty("项目Id")
         @NotNull(message = "projectId is required.")
@@ -58,8 +57,7 @@ public class TaskDto {
         private Long duration;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class ChangeTaskInfo {
         @NotNull(message = "projectId is required.")
         private Long projectId;
@@ -76,8 +74,7 @@ public class TaskDto {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class StartTask {
         @ApiModelProperty("项目Id")
         @NotNull(message = "projectId is required.")
@@ -90,14 +87,12 @@ public class TaskDto {
         private Long id;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class CompleteTask {
         private Long taskId;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class DeleteTask {
         @NotNull(message = "projectId is required.")
         private Long projectId;
@@ -106,8 +101,7 @@ public class TaskDto {
         private Long taskId;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class MoveTask {
         @NotNull(message = "projectId is required.")
         private Long projectId;
@@ -117,8 +111,7 @@ public class TaskDto {
         private Long prevId;    //移动之后的前一个节点
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class InsertTask {
         @NotNull(message = "projectId is required.")
         private Long projectId;
@@ -128,8 +121,7 @@ public class TaskDto {
         private __TaskDto taskId;    //插入的节点
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class UpdateTask{
         @ApiModelProperty("任务id")
@@ -149,8 +141,7 @@ public class TaskDto {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class ChangeBeginTime {
         @ApiModelProperty("项目Id")
         @NotNull(message = "projectId is required.")
@@ -178,8 +169,7 @@ public class TaskDto {
         private String text;
     }
 
-    @Getter
-    @Setter
+    @Data
     public static class TaskSubTimeId {
         private Long id;
     }

tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java

@@ -10,7 +10,7 @@ import lombok.Setter;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
-
+@Data
 public class UserDto {
     @Data
     @ApiModel
@@ -47,8 +47,7 @@ public class UserDto {
         private String code;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class Account{
         @ApiModelProperty("用户id")

tall/src/main/java/com/ccsens/tall/bean/dto/message/AckMessageDto.java

@@ -7,8 +7,7 @@ import lombok.Setter;
 
 @Data
 public class AckMessageDto extends BaseMessageDto {
-    @Setter
-    @Getter
+    @lombok.Data
     public static class Data {
         Long msgId;
     }

tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java

@@ -3,16 +3,16 @@ package com.ccsens.tall.bean.vo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
-
+@Data
 public class DeliverVo {
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DeliverInfo {
         @ApiModelProperty("交付物Id")
         private Long deliverId;
@@ -24,8 +24,7 @@ public class DeliverVo {
         private List<FilePath> fileList;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class FilePath {
         @ApiModelProperty("文件ID")
         private Long fileId;
@@ -51,8 +50,7 @@ public class DeliverVo {
         private List<Checker> checkerList;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class Checker {
         @ApiModelProperty("检查人")
         private Long checkerId;
@@ -66,8 +64,7 @@ public class DeliverVo {
 
     //交付物清单
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DeliverFileList {
         @ApiModelProperty("交付物清单")
         private List<DeliverFile> deliverFileList;
@@ -75,8 +72,7 @@ public class DeliverVo {
         private PageInfo pageInfo;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DeliverFile {
         @ApiModelProperty("交付物Id")
         private Long id;
@@ -92,8 +88,7 @@ public class DeliverVo {
         private DFile file;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DProject{
         @ApiModelProperty("项目Id")
         private Long id;
@@ -101,8 +96,7 @@ public class DeliverVo {
         private String name;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DRole{
         @ApiModelProperty("角色ID")
         private Long id;
@@ -110,8 +104,7 @@ public class DeliverVo {
         private String name;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DTask{
         @ApiModelProperty("任务Id")
         private Long id;
@@ -123,8 +116,7 @@ public class DeliverVo {
         private Long endTime;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DFile{
         @ApiModelProperty("文件ID")
         private Long id;
@@ -136,8 +128,7 @@ public class DeliverVo {
 
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class PageInfo{
         @ApiModelProperty("当前页数")
         private Integer currentPage;

tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java

@@ -10,8 +10,7 @@ import lombok.Setter;
 @Data
 public class DomainVo {
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DomainInfo{
         @ApiModelProperty("配置信息的id")
         private Long id;
@@ -23,7 +22,7 @@ public class DomainVo {
         private String companyName;
         @ApiModelProperty("系统名")
         private String systemName;
-        @ApiModelProperty("是否显示日历")
+        @ApiModelProperty("是否显示日历 0不显示 1显示")
         private int showCalender;
         @ApiModelProperty("不展示日历时。显示的项目的id")
         private Long showProjectId;

tall/src/main/java/com/ccsens/tall/bean/vo/MemberVo.java

@@ -1,11 +1,11 @@
 package com.ccsens.tall.bean.vo;
 
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
-
+@Data
 public class MemberVo {
-    @Getter
-    @Setter
+    @Data
     public static class MemberInfo{
         private Long id;
         private Long userId;

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

@@ -10,8 +10,7 @@ import lombok.Setter;
 public class PluginVo {
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class PluginInfo{
         @ApiModelProperty("插件id")
         private Long id;

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

@@ -10,7 +10,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
-
+@Data
 public class ProjectVo {
     @ApiModel
     @Data
@@ -91,8 +91,7 @@ public class ProjectVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class RoleInfo{
         @ApiModelProperty("二级角色id")
         private Long id;
@@ -115,8 +114,7 @@ public class ProjectVo {
         private String proRoleDescription; //一级角色描述
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class ProMemberVo{
         @JsonIgnore
         private Long mUserId;//成员的userId
@@ -142,8 +140,7 @@ public class ProjectVo {
         private boolean stakeholder;
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class MembersByProject{
         @JsonIgnore
         private Long userId;
@@ -177,8 +174,7 @@ public class ProjectVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class DeliverInfo{
         @ApiModelProperty("交付物Id")
         private Long id;
@@ -207,8 +203,7 @@ public class ProjectVo {
 
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class TemplateStatus{
         @ApiModelProperty("项目Id")
         private Long id;
@@ -240,8 +235,7 @@ public class ProjectVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class ProjectByKey{
         @ApiModelProperty("项目Id")
         private Long id;

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

@@ -35,8 +35,7 @@ public class TaskVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class GlobalTask{
         @ApiModelProperty("任务详细信息id")
         private Long detailId;
@@ -64,8 +63,7 @@ public class TaskVo {
         }
     }
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class NormalTask{
         @ApiModelProperty("任务详细信息id")
         private Long detailId;
@@ -139,8 +137,7 @@ public class TaskVo {
 
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class PluginVo{
         @ApiModelProperty("插件id")
         private Long id;
@@ -151,8 +148,7 @@ public class TaskVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class TaskCheckList{
         @ApiModelProperty("普通任务")
         private List<NormalTask> normalTaskList;
@@ -161,8 +157,7 @@ public class TaskVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class ProjectCheckList{
         @ApiModelProperty("项目Id")
         private Long id;
@@ -171,8 +166,7 @@ public class TaskVo {
     }
 
     @ApiModel
-    @Getter
-    @Setter
+    @Data
     public static class RoleCheckList{
         @ApiModelProperty("角色Id")
         private Long id;

tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java

@@ -6,10 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
-
+@Data
 public class UserVo {
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class UserSign{
         @ApiModelProperty("用户Id")
@@ -33,8 +32,7 @@ public class UserVo {
         private String refresh_token;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class SmsCode{
         @ApiModelProperty("手机号")
@@ -45,8 +43,7 @@ public class UserVo {
         private String smsCode;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class Account{
         @ApiModelProperty("用户id")
@@ -57,8 +54,7 @@ public class UserVo {
         private String password;
     }
 
-    @Getter
-    @Setter
+    @Data
     @ApiModel
     public static class TokenToUserId{
         @ApiModelProperty("用户id")

tall/src/main/java/com/ccsens/tall/config/SpringConfig.java

@@ -103,12 +103,13 @@ public class SpringConfig implements WebMvcConfigurer {
      */
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/upload/**")
-                .addResourceLocations("classpath:/upload/");
         registry.addResourceHandler("swagger-ui.html")
                 .addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+        registry.addResourceHandler("/uploads/**")
+                .addResourceLocations("file:///home/cloud/tall/uploads/");
         //super.addResourceHandlers(registry);
     }
 

tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java

@@ -13,7 +13,7 @@ import java.util.List;
 public interface TaskDetailDao extends ProTaskDetailMapper {
     List<TaskVo.NormalTask> selectNormalTaskListByPM(@Param("projectId") Long projectId, @Param("parentId") Long parentId, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
-    List<TaskVo.NormalTask> selectTaskByRoleAndAllMembers(@Param("projectId") Long projectId, @Param("roleId") Long roleId, @Param("allMemberId") Long allMemberId,
+    List<TaskVo.NormalTask> selectTaskByRoleAndAllMembers(@Param("projectId") Long projectId, @Param("roleId") Long roleId,
                                                           @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
     TaskVo.NormalTask selectTaskByTaskId(@Param("subTimeId") Long subTimeId, @Param("taskId") Long taskId);

tall/src/main/java/com/ccsens/tall/service/ProMemberService.java

@@ -136,24 +136,9 @@ public class ProMemberService implements IProMemberService {
      */
     @Override
     public List<ProRole> selectRolesByUserIdAndProjectId(Long userId, Long projectId) throws Exception {
-//        List<ProRole> roleList = new ArrayList<>();
-//        ProMemberExample memberExample = new ProMemberExample();
-//        memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId);
-//        List<ProMember> memberList = proMemberDao.selectByExample(memberExample);
-//        if (CollectionUtil.isNotEmpty(memberList)) {
-//            ProMember member = memberList.get(0);
-//            ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
-//            memberRoleExample.createCriteria().andMemberIdEqualTo(member.getId());
-//            List<ProMemberRole> memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample);
-//            if(CollectionUtil.isNotEmpty(memberRoleList)){
-//                for(ProMemberRole memberRole:memberRoleList){
-//                    ProRole role = proRoleDao.selectByPrimaryKey(memberRole.getRoleId());
-//                    roleList.add(role);
-//                }
-//            }
-//        }
+
         List<ProRole> roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, userId);
-        if(CollectionUtil.isNotEmpty(roleList)){
+        if(CollectionUtil.isEmpty(roleList)){
             ProRoleExample roleExample = new ProRoleExample();
             roleExample.createCriteria().andProjectIdEqualTo(projectId)
                     .andNameEqualTo(WebConstant.ROLE_NAME.Attention.phase).andParentIdNotEqualTo(0L);
@@ -165,6 +150,8 @@ public class ProMemberService implements IProMemberService {
         return roleList;
     }
 
+
+
     @Override
     public MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception {
         return proMemberDao.selectByProjectIdAndUserId(projectId,currentUserId);

tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 @Slf4j
@@ -52,18 +54,17 @@ public class ProRoleService implements IProRoleService {
     }
 
     /**
-     * 查询项目下的所有角色（二级角色）
+     * 根据项目id和用户Id查询项目下的所有二级角色的详细信息
      */
     @Override
     public List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception {
         List<ProjectVo.RoleInfo> memberRoleList = null;
         //1.查询二级角色(项目经理+项目成员+mvp)
         memberRoleList = getRealMemberRolesByProjectId(projectId);
-
-        //是否mine
-        if (CollectionUtil.isNotEmpty(memberRoleList)) {
         //获取用户在项目中的角色
         List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId);
+        //是否mine
+        if (CollectionUtil.isNotEmpty(memberRoleList)) {
             for (ProjectVo.RoleInfo memberRole : memberRoleList) {
                 if (ObjectUtil.isNotNull(roleList)) {
                     for(ProRole role:roleList){
@@ -78,9 +79,23 @@ public class ProRoleService implements IProRoleService {
             }
         }
         //排除该角色不能看的其他角色
-        List<Long> carelessMemberRoleList = getCareLessRoleByProjectIdAndUserId(projectId, currentUserId);
-        if (CollectionUtil.isNotEmpty(carelessMemberRoleList)) {
-            for (Long otherRoleId : carelessMemberRoleList) {
+//        List<Long> carelessMemberRoleList = getCareLessRoleByProjectIdAndUserId(projectId, currentUserId);
+        List<Long> excludeIdList = new ArrayList<>();
+        if(CollectionUtil.isNotEmpty(roleList)){
+            for(ProRole role :roleList){
+                ProRoleExcludeExample excludeExample = new ProRoleExcludeExample();
+                excludeExample.createCriteria().andOtherRoleIdEqualTo(role.getId());
+                List<ProRoleExclude> excludeList = excludeDao.selectByExample(excludeExample);
+                if(CollectionUtil.isNotEmpty(excludeList)){
+                    for(ProRoleExclude roleExclude : excludeList){
+                        excludeIdList.add(roleExclude.getRoleId());
+                    }
+                }
+            }
+        }
+
+        if (CollectionUtil.isNotEmpty(excludeIdList)) {
+            for (Long otherRoleId : excludeIdList) {
                 for (ProjectVo.RoleInfo memberRole : memberRoleList) {
                     if (otherRoleId.longValue() == memberRole.getId().longValue()) {
                         if(!memberRole.isMine()){
@@ -134,9 +149,6 @@ public class ProRoleService implements IProRoleService {
         return memberRoleList;
     }
 
-    /**
-     * 查询项目下所有二级角色
-     */
     @Override
     public List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId) {
         //查询二级角色

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.tall.bean.po.*;
+import com.ccsens.tall.bean.vo.ProjectVo;
 import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.persist.dao.*;
 import com.ccsens.tall.util.TaskUtil;
@@ -183,7 +184,9 @@ public class ProTaskDetailService implements IProTaskDetailService {
             allMemberId = allMember.getId();
         }
         //查找该角色的所有任务(全体成员的任务也是这个角色的任务）
-        List<TaskVo.NormalTask> secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, allMemberId, startTime, endTime);
+        List<TaskVo.NormalTask> secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, startTime, endTime);
+        List<TaskVo.NormalTask> secondTaskVoList2 = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, allMemberId, startTime, endTime);
+        secondTaskVoList.addAll(secondTaskVoList2);
         if (CollectionUtil.isNotEmpty(secondTaskVoList)) {
             for (TaskVo.NormalTask normalTask : secondTaskVoList) {
                 ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());
@@ -535,7 +538,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     case "创建者":
                         for (SysProject project : projectList) {
                             if (project.getCreatorId().longValue() == currentUserId.longValue()) {
-                                List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime);
+                                List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime,null);
                                 if (CollectionUtil.isNotEmpty(taskList)) {
                                     normalTaskList.addAll(taskList);
                                 }
@@ -545,7 +548,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     case "参与者":
                         for (SysProject project : projectList) {
                             if (project.getCreatorId().longValue() != currentUserId.longValue()) {
-                                List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime);
+                                List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime,null);
                                 if (CollectionUtil.isNotEmpty(taskList)) {
                                     normalTaskList.addAll(taskList);
                                 }
@@ -557,7 +560,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                 }
             } else {
                 for (SysProject project : projectList) {
-                    List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime);
+                    List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime,null);
                     if (CollectionUtil.isNotEmpty(taskList)) {
                         normalTaskList.addAll(taskList);
                     }
@@ -614,21 +617,25 @@ public class ProTaskDetailService implements IProTaskDetailService {
     }
 
     private List<TaskVo.NormalTask> getTaskInfoByProjectIdAndUserId(SysProject project, Long userId,
-                                                                    Long startTime, Long endTime) throws Exception {
+                                                                    Long startTime, Long endTime,List<ProRole> roleList) throws Exception {
         List<TaskVo.NormalTask> normalTaskList = new ArrayList<>();
         //获取用户的角色
-        List<ProRole> roleList = proRoleService.getProRoleByProjectIdAndUserId(project.getId(), userId);
+        if(CollectionUtil.isEmpty(roleList)){
+            //查询此用户在项目中的的所有角色的任务
+            roleList = proMemberService.selectRolesByUserIdAndProjectId(userId, project.getId());
+        }
+//        List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(userId, project.getId());
+
         //获取“全体成员”角色
         ProRole allMember = proRoleService.getAllMember(project.getId());
-        Long allMemberId = null;
         if (ObjectUtil.isNotNull(allMember)) {
-            allMemberId = allMember.getId();
+            roleList.add(allMember);
         }
         if (CollectionUtil.isNotEmpty(roleList)) {
             for (ProRole role : roleList) {
                 SysProject sysProject = sysProjectDao.selectByPrimaryKey(role.getProjectId());
                 List<TaskVo.NormalTask> taskList =
-                        taskDetailDao.selectTaskByRoleAndAllMembers(project.getId(), role.getId(), allMemberId, startTime, endTime);
+                        taskDetailDao.selectTaskByRoleAndAllMembers(project.getId(), role.getId(), startTime, endTime);
                 if (CollectionUtil.isNotEmpty(taskList)) {
                     for (TaskVo.NormalTask normalTask : taskList) {
                         //修改任务的完成状态
@@ -675,10 +682,27 @@ public class ProTaskDetailService implements IProTaskDetailService {
             timeMap = DateUtil.projectFormatDateTime(start);
             endMillisTime = timeMap.get("endMillisTime");
         }
+        //获取需查询的角色
+        List<ProRole> roleList = new ArrayList<>();
+        if(ObjectUtil.isNotNull(roleId)){
+            //获取指定的角色
+            ProRole role = proRoleDao.selectByPrimaryKey(roleId);
+            roleList.add(role);
+        }else {
+            //查询项目下所有角色的任务
+            List<ProjectVo.RoleInfo> roleInfoList = proRoleService.getRealMemberRolesByProjectId(projectId);
+            if(CollectionUtil.isNotEmpty(roleInfoList)) {
+                for (ProjectVo.RoleInfo roleInfo : roleInfoList) {
+                    ProRole role = proRoleDao.selectByPrimaryKey(roleInfo.getId());
+                    roleList.add(role);
+                }
+            }
+        }
+
         //获取项目
         SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId);
         if (ObjectUtil.isNotNull(sysProject)) {
-            List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(sysProject, currentUserId, startMillisTime, endMillisTime);
+            List<TaskVo.NormalTask> taskList = getTaskInfoByProjectIdAndUserId(sysProject, currentUserId, startMillisTime, endMillisTime,roleList);
             if (CollectionUtil.isNotEmpty(taskList)) {
                 normalTaskList.addAll(taskList);
             }

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -91,7 +91,7 @@ public class TaskDeliverService implements ITaskDeliverService {
                     if (CollectionUtil.isNotEmpty(postLogList)) {
                         ProTaskDeliverPostLog postLog = postLogList.get(0);
                         SysCommitedFile file = commitedFileDao.selectByPrimaryKey(postLog.getFileId());
-                        deliverInfoByMVP.setUrl(WebConstant.URL_BASE + file.getPath());
+                        deliverInfoByMVP.setUrl(WebConstant.TEST_URL_BASE + file.getPath());
 
                         ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample();
                         checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId());
@@ -228,7 +228,7 @@ public class TaskDeliverService implements ITaskDeliverService {
             List<ProjectVo.DeliverInfo> deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId());
             if (CollectionUtil.isNotEmpty(deliverInfoList)) {
                 deliverInfo = deliverInfoList.get(0);
-                deliverInfo.setUrl(WebConstant.URL_BASE + deliverInfo.getUrl());
+                deliverInfo.setUrl(WebConstant.TEST_URL_BASE + deliverInfo.getUrl());
             }
 
             //消息的内容
@@ -433,7 +433,7 @@ public class TaskDeliverService implements ITaskDeliverService {
         if (CollectionUtil.isNotEmpty(fileIds)) {
             for (DeliverVo.FilePath filePath : fileIds) {
                 //修改文件路径为可下载路径
-                filePath.setUrl(WebConstant.URL_BASE + filePath.getUrl());
+                filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl());
                 if (ObjectUtil.isNotNull(filePath.getUploaderId())) {
                     //添加上传人的姓名信息
                     ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(), task.getProjectId());

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -385,7 +385,7 @@ public class UserService implements IUserService {
         List<ProMember> proMemberList = memberDao.selectByExample(memberExample);
         if (CollectionUtil.isNotEmpty(proMemberList)) {
             for (ProMember member : proMemberList) {
-                if (ObjectUtil.isNull(member.getUserId())) {
+                if (ObjectUtil.isNull(member.getUserId()) || member.getUserId() == 0) {
                     member.setUserId(userId);
                     memberDao.updateByPrimaryKeySelective(member);
                 }

tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@@ -65,7 +65,7 @@
         WHERE
           d.project_id = #{projectId}
         AND
-          d.executor_role in(#{roleId},#{allMemberId})
+          d.executor_role = #{roleId}
         <if test="startTime != null">
             AND
             s.begin_time &lt; #{endTime}

util/src/main/java/com/ccsens/util/WebConstant.java

@@ -66,12 +66,13 @@ public class WebConstant {
     public static final String KEY_WEBSOCKET_GROUPID = "WebScoket_groupId";
     public static final String PREFIX_WEBSOCKET_GROUPID = "groupId=";
 
-    public static final String UPLOAD_PATH_BASE = "/home/ptpro/uploads";
+    public static final String UPLOAD_PATH_BASE = "/home/cloud/tall/uploads";
     public static final String UPLOAD_PATH_DELIVER = UPLOAD_PATH_BASE + File.separator + "delivers";
     public static final String UPLOAD_PATH_DELIVER1 ="delivers";
     public static final String UPLOAD_PATH_PREVIEW ="preview";
     public static final String UPLOAD_PROJECT_WBS = UPLOAD_PATH_BASE + File.separator + "project";
     public static final String URL_BASE = "https://api.ccsens.com/ptpro/uploads/";
+    public static final String TEST_URL_BASE = "https://test.tall.wiki/pt-dev/uploads/";
 
     public static final Integer Expired_Verify_Code_In_Seconds = 120;
     public static final Integer Exist_Verify_Code_In_Seconds = 60;