From 673a859c7f3fcebc885bdd3f6e2a6f199006db10 Mon Sep 17 00:00:00 2001 From: yujt Date: Mon, 20 Jul 2020 13:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E6=9E=90PC=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-analysis-pc-client/pom.xml | 28 ++++ .../epdc/dto/issue/form/HotIssueFormDTO.java | 48 ++++++ .../form/IssueStatisticsInfoFormDTO.java | 51 ++++++ .../epdc/dto/issue/form/NewIssueFormDTO.java | 47 ++++++ .../dto/issue/result/HotIssueResultDTO.java | 32 ++++ .../result/IssueClassifiedStatisticDTO.java | 35 +++++ .../epdc/dto/issue/result/IssueResultDTO.java | 64 ++++++++ .../result/IssueStatisticsInfoResultDTO.java | 24 +++ .../dto/issue/result/NewIssueResultDTO.java | 43 ++++++ .../dto/item/form/HotItemListFormDTO.java | 48 ++++++ .../dto/item/form/ItemAnalysisFormDTO.java | 60 +++++++ .../epdc/dto/item/form/ItemSurveyFormDTO.java | 33 ++++ .../item/result/DifficultItemResultDTO.java | 60 +++++++ .../dto/item/result/HotItemListResultDTO.java | 29 ++++ .../item/result/ItemAnalysisResultDTO.java | 65 ++++++++ .../epdc/dto/item/result/ItemResultDTO.java | 63 ++++++++ .../dto/item/result/ItemSurveyResultDTO.java | 49 ++++++ .../result/ReportSolvedItemResultDTO.java | 56 +++++++ .../result/ReportUnsolvedItemResultDTO.java | 48 ++++++ .../item/result/UnsolvedItemResultDTO.java | 57 +++++++ .../epdc/dto/topic/form/HotTopicFormDTO.java | 48 ++++++ .../dto/topic/form/NewHotTopicFormDTO.java | 47 ++++++ .../dto/topic/result/HotTopicResultDTO.java | 32 ++++ .../topic/result/NewHotTopicResultDTO.java | 43 ++++++ .../epdc/dto/topic/result/TopicResultDTO.java | 61 ++++++++ .../epdc/dto/user/MetaUserGridOpiningDTO.java | 146 ++++++++++++++++++ .../epdc/dto/user/MetaUserPartyRankDTO.java | 127 +++++++++++++++ .../dto/user/MetaUserRegisterRankDTO.java | 137 ++++++++++++++++ .../esua/epdc/dto/user/UserAnalysisDTO.java | 15 ++ .../dto/user/form/ExportOperationFormDTO.java | 25 +++ .../epdc/dto/user/form/MemberRankFormDTO.java | 41 +++++ .../esua/epdc/dto/user/form/UserCountDTO.java | 20 +++ .../user/form/UserRegisterDataFormDTO.java | 13 ++ .../dto/user/form/UserSortRankFormDTO.java | 47 ++++++ .../result/ExportOperationDataResultDTO.java | 81 ++++++++++ .../user/result/GridDataTotalResultDTO.java | 23 +++ .../dto/user/result/GridOpeningResultDTO.java | 104 +++++++++++++ .../dto/user/result/GriddingCountDTO.java | 28 ++++ .../user/result/OldMemberRankResultDTO.java | 34 ++++ .../dto/user/result/UserAnalysisCountDTO.java | 44 ++++++ .../user/result/UserDataRankResultDTO.java | 72 +++++++++ .../result/UserRegisterDataResultDTO.java | 13 ++ .../user/result/UserSortRankResultDTO.java | 41 +++++ .../user/result/YoungMemberRankResultDTO.java | 34 ++++ pom.xml | 2 +- 45 files changed, 2217 insertions(+), 1 deletion(-) create mode 100644 epdc-cloud-analysis-pc-client/pom.xml create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/pom.xml b/epdc-cloud-analysis-pc-client/pom.xml new file mode 100644 index 0000000..acbc80c --- /dev/null +++ b/epdc-cloud-analysis-pc-client/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + + com.esua.epdc.yushan + epdc-cloud-client-yushan + 1.0.0 + + + epdc-cloud-analysis-pc-client + jar + 榆山党群e家管理端数据分析模块 + + + + com.esua.epdc.yushan + epdc-commons-tools + ${epdc-cloud-commons.version} + + + + + ${project.artifactId} + + + \ No newline at end of file diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java new file mode 100644 index 0000000..2a9e87e --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最热议题接口入参DTO + * @Author wgf + * @Date 2020/2/12 8:31 + */ +@Data +public class HotIssueFormDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认10页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private Integer pageSize = 10; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 + */ + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java new file mode 100644 index 0000000..c933960 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java @@ -0,0 +1,51 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 议题项目数量类目分析DTO + * @Author zy + * @Date 2020/2/11 11:58 + */ +@Data +public class IssueStatisticsInfoFormDTO implements Serializable { + private static final long serialVersionUID = 6544783947414092507L; + /** + * 主键 + */ + private String id; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认5页 + */ + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 分类类别, 默认1 + */ + @NotBlank(message = "分类类别不能为空") + private String cotegoryType; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java new file mode 100644 index 0000000..20b8575 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最新发布议题接口DTO + * @Author wgf + * @Date 2020/2/11 10:31 + */ +@Data +public class NewIssueFormDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认10页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private Integer pageSize = 10; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 + */ + //@NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java new file mode 100644 index 0000000..881ad9b --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 最热议题接口DTO + * @Author wgf + * @Date 2020/2/12 8:31 + */ +@Data +public class HotIssueResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 话题Id（TopicId） + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 表态数 + */ + private String statementNum; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java new file mode 100644 index 0000000..b9a9c4f --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 议题分类统计 + * @Author yinzuomei + * @Date 2020/2/11 9:31 + */ +@Data +public class IssueClassifiedStatisticDTO implements Serializable { + private static final long serialVersionUID = 3697313657209369676L; + /** + * 目录名称 + */ + private String categoryName; + /** + * 议题项目总数 + */ + private Integer categoryNum; + /** + * 议题数 + */ + private Integer issueNum; + /** + * 项目数 + */ + private Integer itemNum; + /** + * 类目名称：1一级类目2二级类目3三季类目 + */ + private String categoryLevel; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java new file mode 100644 index 0000000..b3b3897 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java @@ -0,0 +1,64 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 议题列表DTO + * @Author yinzuomei + * @Date 2020/2/10 15:58 + */ +@Data +public class IssueResultDTO implements Serializable { + /** + * epdc_issue主键 + */ + private String id; + + /** + * 议题内容 + */ + private String issueContent; + + /** + * 来源网格-所有部门 + */ + private String allDeptNames; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 发布时间 + */ + private Date createdTime; + + /** + * 支持-点赞次数 + */ + private Integer approveNum; + + /** + * 反对-踩次数 + */ + private Integer opposeNum; + + /** + * 评论数 + */ + private Integer commentNum; + + /** + * 浏览数 + */ + private Integer browseNum; + + /** + * 表达态度（评论+回复+浏览） + */ + private Integer expressAttitudeNum; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java new file mode 100644 index 0000000..edb29ad --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 议题项目数量类目分析DTO + * @Author zy + * @Date 2020/2/11 11:58 + */ +@Data +public class IssueStatisticsInfoResultDTO implements Serializable { + + /** + * 分类名称 + */ + private String cotegoryName; + + /** + * 数量 + */ + private Integer count; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java new file mode 100644 index 0000000..94c11fe --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最新发布议题接口DTO + * @Author wgf + * @Date 2020/2/10 11:31 + */ +@Data +public class NewIssueResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 话题Id（TopicId） + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 图片 + */ + private List images; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 创建时间 + */ + private String createdTime; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java new file mode 100644 index 0000000..d2bed54 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最热项目接口DTO + * @Author zy + * @Date 2020/2/12 + */ +@Data +public class HotItemListFormDTO implements Serializable { + private static final long serialVersionUID = 6145783947444092507L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认5页 + */ + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年） + */ + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java new file mode 100644 index 0000000..2dc00a6 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java @@ -0,0 +1,60 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 疑难项目分析DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = 6144783947444092507L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认5页 + */ + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 分析类型（1:耗时最长，2:设计部门最多，3:处理次数最多） + */ + @NotNull(message = "分析类型不能为空") + private Integer analysisType; + + /** + * 项目状态（1:结案或关闭，2:解决中） + */ + @NotNull(message = "项目状态不能为空") + private Integer itemState; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年） + */ + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java new file mode 100644 index 0000000..81a77b4 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 重点项目概况DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemSurveyFormDTO implements Serializable { + private static final long serialVersionUID = 6544783947444092507L; + /** + * 主键 + */ + private String id; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java new file mode 100644 index 0000000..5294817 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java @@ -0,0 +1,60 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 疑难项目 + * @Author yinzuomei + * @Date 2020/2/11 13:09 + */ +@Data +public class DifficultItemResultDTO implements Serializable { + private static final long serialVersionUID = -4125919212689714492L; + /** + * 主键 + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 转项目时间 + */ + private Date createdTime; + /** + * 处理次数 + */ + private Integer operatNum; + /** + * 是否流转网格化平台 + */ + private String reportFlag; + /** + * 涉及部门数量 + */ + private Integer deptNum; + /** + * 项目状态 + */ + private String itemState; + /** + * 处理完毕时间 + */ + private Date processedTime; + /** + * 处理时长 + */ + private Integer takeTime; + /** + * 项目来源网格名称 + */ + private String allDeptNames; + /** + * 居民满意度评价 + */ + private String evaluationScore; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java new file mode 100644 index 0000000..db165f0 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 最热项目接口DTO + * @Author zy + * @Date 2020/2/12 + */ +@Data +public class HotItemListResultDTO implements Serializable { + + /** + * 项目Id（itemId） + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 表态数 + */ + private String statementNum; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java new file mode 100644 index 0000000..4db3b34 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java @@ -0,0 +1,65 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 疑难项目分析DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemAnalysisResultDTO implements Serializable { + + /** + * 主键 + */ + private String id; + + /** + * 项目内容 + */ + private String content; + + /** + * 创建时间 + */ + private String createdTime; + + /** + * 图片 + */ + private List images; + + /** + * 项目状态 0-处理中，5-已关闭，10-已结案 + */ + private Integer itemState; + + /** + * 分类名称 + */ + private String categoryName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 耗时（小时） + */ + private Integer spendTime; + + /** + * 部门数量 + */ + private Integer deptCount; + + /** + * 处理次数 + */ + private Integer handleCount; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java new file mode 100644 index 0000000..6e938d0 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java @@ -0,0 +1,63 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 项目列表DTO + * @Author yinzuomei + * @Date 2020/2/10 13:44 + */ +@Data +public class ItemResultDTO implements Serializable { + /** + * epdc_item表主键 + */ + private String id; + + /** + * 议题内容-项目摘要 + */ + private String itemContent; + + /** + * 所有部门 + */ + private String allDeptNames; + + /** + * 发布人用户昵称 + */ + private String nickName; + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 支持-点赞次数 + */ + private Integer approveNum; + + /** + * 反对-踩次数 + */ + private Integer opposeNum; + + /** + * 评论数 + */ + private Integer commentNum; + + /** + * 浏览数 + */ + private Integer browseNum; + + /** + * 表达态度（评论+回复+浏览） + */ + private Integer expressAttitudeNum; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java new file mode 100644 index 0000000..661cf82 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java @@ -0,0 +1,49 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 重点项目概况DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemSurveyResultDTO implements Serializable { + + /** + * 未解决项目数 + */ + private Integer unsolvedCount; + + /** + * 超时项目数 + */ + private Integer timeoutCount; + + /** + * 未超时项目数 + */ + private Integer noTimeoutCount; + + /** + * 区调度项目数 + */ + private Integer dispatchCount; + + /** + * 解决中项目数 + */ + private Integer solvingCount; + + /** + * 已解决项目数 + */ + private Integer solvedCount; + + /** + * 更新时间 + */ + private String updateTime; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java new file mode 100644 index 0000000..978df82 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java @@ -0,0 +1,56 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 区域调度-已解决项目列表 + * @Author yinzuomei + * @Date 2020/2/11 15:12 + */ +@Data +public class ReportSolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = -600933427201742607L; + /** + * 主键 + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 转项目时间 + */ + private Date createdTime; + /** + * 网格名称 + */ + private String grid; + /** + * 向网格化平台上报部门 + */ + private String reportDept; + /** + * 向网格化平台上报时间 + */ + private Date reportTime; + /** + * 最新处理部门 + */ + private Date lastHandlerTime; + /** + * 最新处理时间 + */ + private String lastHandlerDept; + /** + * 项目状态 + */ + private String itemState; + /** + * 居民评价 + */ + private String evaluationScore; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java new file mode 100644 index 0000000..ed0119d --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 区域调度-解决中项目列表 + * @Author yinzuomei + * @Date 2020/2/11 15:10 + */ +@Data +public class ReportUnsolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = 2364303777789369092L; + /** + * 主键 + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 转项目时间 + */ + private Date createdTime; + /** + * 网格名称 + */ + private String grid; + /** + * 向网格化平台上报部门 + */ + private String reportDept; + /** + * 向网格化平台吹哨时间 + */ + private Date reportTime; + /** + * 最新进展处理部门 + */ + private Date lastHandlerTime; + /** + * 最新进展处理时间 + */ + private String lastHandlerDept; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java new file mode 100644 index 0000000..14fd2ef --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java @@ -0,0 +1,57 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 未解决项目列表 + * @Author yinzuomei + * @Date 2020/2/10 18:58 + */ +@Data +public class UnsolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = 7659596790013430029L; + /** + * epdc_item表主键 + */ + private String id; + + /** + * 议题内容-项目摘要 + */ + private String itemContent; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 所有部门 + */ + private String allDeptNames; + + /** + * 发布人用户昵称 + */ + private String nickName; + + /** + * 处理次数 + */ + private Integer solveNum; + + /** + *最新进展处理时间 + */ + private Date latestHandleTime; + + /** + * 最新进展处理部门 + */ + private String latestHandleDeptName; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java new file mode 100644 index 0000000..ce99483 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最热话题接口入参DTO + * @Author wgf + * @Date 2020/2/11 10:31 + */ +@Data +public class HotTopicFormDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认10页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private Integer pageSize = 10; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 + */ + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java new file mode 100644 index 0000000..60d77af --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.dto.topic.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最新发布话题接口入参DTO + * @Author wgf + * @Date 2020/2/11 10:31 + */ +@Data +public class NewHotTopicFormDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认10页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private Integer pageSize = 10; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 + */ + //@NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType = 1; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java new file mode 100644 index 0000000..71fba9e --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 最热话题接口DTO + * @Author wgf + * @Date 2020/2/11 11:31 + */ +@Data +public class HotTopicResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 话题Id（TopicId） + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 表态数 + */ + private String statementNum; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java new file mode 100644 index 0000000..90107f2 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java @@ -0,0 +1,43 @@ +package com.elink.esua.epdc.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 最新发布话题接口DTO + * @Author wgf + * @Date 2020/2/10 11:31 + */ +@Data +public class NewHotTopicResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 话题Id（TopicId） + */ + private String id; + + /** + * 内容 + */ + private String content; + + /** + * 图片 + */ + private List images; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 创建时间 + */ + private String createdTime; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java new file mode 100644 index 0000000..17c9f46 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java @@ -0,0 +1,61 @@ +package com.elink.esua.epdc.dto.topic.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 话题列表DTO + * @Author yinzuomei + * @Date 2020/2/10 11:31 + */ +@Data +public class TopicResultDTO implements Serializable { + private static final long serialVersionUID = -1938141144074477454L; + + /** + * 主键 + */ + private String id; + + /** + * 话题摘要 + */ + private String topicContent; + + /** + * 所有部门 + */ + private String allDeptNames; + + /** + * 网格来源群名称 + */ + private String groupName; + + /** + * 话题发布人姓名 + */ + private String nickName; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 评论数（评论+回复） + */ + private Integer commentNum; + + /** + * 浏览数 + */ + private Integer browseNum; + + /** + * 表达态度（评论+回复+浏览） + */ + private Integer expressAttitudeNum; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java new file mode 100644 index 0000000..c3b3d37 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java @@ -0,0 +1,146 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.user; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 网格开通情况 + * + * @author qu elink@elink-cn.com + * @since v1.0.0 2020-03-25 + */ +@Data +public class MetaUserGridOpiningDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 网格id + */ + private String gridId; + + /** + * 用户总数 + */ + private int registerCount; + + /** + * 党员数 + */ + private int partyCount; + + /** + * 已注册居民 + */ + private int residentCount; + + /** + * 未注册居民 + */ + private int unAuthorizedCount; + + /** + * 新闻发布数 + */ + private int newsCount; + + /** + * 社群数 + */ + private int communityCount; + + /** + * 群成员数 + */ + private int communityMemberCount; + + /** + * 群话题数 + */ + private int communityTopicCount; + + /** + * 议题总数 + */ + private int eventCount; + + /** + * 项目数 + */ + private int itemCount; + + /** + * 项目已解决数 + */ + private int itemCloseCount; + + /** + * 好评数 + */ + private int itemPraiseCount; + + /** + * 网格名称 + */ + private String allDeptName; + + /** + * 网格党建指导员姓名 + */ + private String gridLeader; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 注册时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java new file mode 100644 index 0000000..be8c514 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java @@ -0,0 +1,127 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.user; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 党员排行 + * + * @author qu elink@elink-cn.com + * @since v1.0.0 2020-03-26 + */ +@Data +public class MetaUserPartyRankDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 街道id + */ + private String streetId; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 已注册党员数量（已认证） + */ + private Integer partyMemberCount; + + /** + * 年龄超过50岁党员数量 + */ + private Integer oldCount; + + /** + * 老龄化比例 + */ + private BigDecimal oldPercent; + + /** + * 年龄50岁以下的党员数量 + */ + private Integer youngCount; + + /** + * 年轻化比例 + */ + private BigDecimal youngPercent; + + /** + * 男 + */ + private Integer maleCount; + + /** + * 女 + */ + private Integer femaleCount; + + /** + * 未知性别 + */ + private Integer unknownSexCount; + + /** + * 党员认证失败数 + */ + private Integer partyAuthFailureCount; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 注册时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java new file mode 100644 index 0000000..52f3b71 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java @@ -0,0 +1,137 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.user; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 用户注册排行 + * + * @author qu elink@elink-cn.com + * @since v1.0.0 2020-03-26 + */ +@Data +public class MetaUserRegisterRankDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 街道id + */ + private String streetId; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 用户总数 + */ + private Integer userCount; + + /** + * 党员数 + */ + private Integer partyMemberCount; + + /** + * 已注册居民 + */ + private Integer residentCount; + + /** + * 为注册居民 + */ + private Integer unAuthorizedCount; + + /** + * 年龄超过50岁 + */ + private Integer oldCount; + + /** + * 老龄化比例 + */ + private BigDecimal oldPercent; + + /** + * 50岁以下用户数量 + */ + private Integer youngCount; + + /** + * 年轻化比例 + */ + private BigDecimal youngPercent; + + /** + * 男 + */ + private Integer maleCount; + + /** + * 女 + */ + private Integer femaleCount; + + /** + * 未知性别 + */ + private Integer unknownSexCount; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 注册时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java new file mode 100644 index 0000000..8641b88 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java @@ -0,0 +1,15 @@ +package com.elink.esua.epdc.dto.user; + +import lombok.Data; + +/** + * 用户注册数据分析 + * + * @author work@yujt.net.cn + * @date 2020/2/11 10:43 + */ +@Data +public class UserAnalysisDTO { + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java new file mode 100644 index 0000000..f8ebbe5 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class ExportOperationFormDTO implements Serializable { + + private String operationStartTime; + + private String operationEndTime; + + /** + * 所有部门列表 + */ + private List allDeptIdsShow; + + private List allStreetIds; + + private String endTime; + + private List deptIdList; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java new file mode 100644 index 0000000..9509ffb --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @author songyunpeng + * @Description 党员老龄化和年轻化排名查询表单 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class MemberRankFormDTO { + + /** + * 页码 + */ + @NotNull(message = "页码不能为空") + private Integer pageIndex; + /** + * 页容量 + */ + @NotNull(message = "分页数量不能为空") + private Integer pageSize; + /** + * 时间戳(yyyy-MM-dd HH:mm:ss) + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + /** + * 排序状态（1：降序，2升序） + */ + @NotBlank(message = "排序状态不能为空") + private String sortState; + /** + * 部门Id + */ + private String deptId; + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java new file mode 100644 index 0000000..f47fd38 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +/** + * @program: esua-epdc-cloud + * @description: 用户数据统计/网格开通数量 + * @author: wangtong + * @create: 2020-02-12 10:03 + **/ +@Data +public class UserCountDTO{ + + + /** + * 部门id + */ + private String deptId; + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java new file mode 100644 index 0000000..4238927 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java @@ -0,0 +1,13 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +/** + * 用户注册数据分析 + * + * @author work@yujt.net.cn + * @date 2020/2/11 09:43 + */ +@Data +public class UserRegisterDataFormDTO { +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java new file mode 100644 index 0000000..ac299bb --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.dto.user.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @author lpf + * @Description 用户排名 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class UserSortRankFormDTO { + + /** + * 页码 + */ + @NotNull(message = "页码不能为空") + private Integer pageIndex; + /** + * 页容量 + */ + @NotNull(message = "分页数量不能为空") + private Integer pageSize; + /** + * 时间戳(yyyy-MM-dd HH:mm:ss) + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + /** + * 排序状态（1：降序，2升序） + */ + @NotBlank(message = "排序状态不能为空") + private String sortState ="1"; + /** + * 排序类型（1：按用户数，2按党员数） + */ + @NotBlank(message = "排序类型") + private String sortType = "1"; + /** + * 部门Id + */ + private String deptId; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java new file mode 100644 index 0000000..3762374 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java @@ -0,0 +1,81 @@ +package com.elink.esua.epdc.dto.user.result; + + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @author: qushutong + * @Date: 2020/3/23 14:47 + * @Description: 运营导出数据 + */ +@Data +public class ExportOperationDataResultDTO implements Serializable { + + private static final long serialVersionUID = -798787916350968587L; + + /** + * 居民数 + */ + private int registerCount = 0; + + /** + * 未认证用户数 + */ + private int unAuthorizedCount = 0; + + + /** + * 党员数 + */ + private int partyCount = 0; + + /** + * 新闻发布数 + */ + private int newsCount = 0; + + + /** + * 议题数 + */ + private int eventCount = 0; + + /** + * 项目数 + */ + private int itemCount = 0; + + /** + * 项目解决数 + */ + private int itemCloseCount = 0; + + /** + * 社群数 + */ + private int communityCount = 0; + + /** + * 社群成员数 + */ + private int communityMemberCount = 0; + + /** + * 社群话题数 + */ + private int communityTopicCount = 0; + + /** + * 街道 + */ + private String streetName; + + /** + * 企业数 + */ + private int enterpriseCount = 0; + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java new file mode 100644 index 0000000..be71415 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +/** + * 已开通网格 用户数据总计 + * + * @author work@yujt.net.cn + * @date 2020/2/13 13:46 + */ +@Data +public class GridDataTotalResultDTO extends GridOpeningResultDTO { + + /** + * 已开通网格数 + */ + private int workGridCount = 0; + /** + * 未开通网格数 + */ + private int unWorkGridCount = 0; + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java new file mode 100644 index 0000000..ca89f0e --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -0,0 +1,104 @@ +package com.elink.esua.epdc.dto.user.result; + + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author: qushutong + * @Date: 2020/2/11 13:09 + * @Description: 开通网格情况 + */ +@Data +public class GridOpeningResultDTO implements Serializable { + + private static final long serialVersionUID = -852226852590425991L; + + private String gridId; + + /** + * 街道社区网格 + */ + private String allDeptName; + /** + * 用户注册数 + */ + private int registerCount = 0; + /** + * 居民数（包括认证成功和党员认证失败的居民） + */ + private int residentCount = 0; + + /** + * 认证党员数 + */ + private int partyCount = 0; + + /** + * 未认证用户（根据用户第一次扫码的网格统计） + */ + private Integer unAuthorizedCount = 0; + + /** + * 居民扫码数 + */ + private int ewmCount = 0; + + /** + * 新闻数 + */ + private int newsCount = 0; + + /** + * 通知数 + */ + private int noticeCount = 0; + + /** + * 议题数 + */ + private int eventCount = 0; + + /** + * 项目数 + */ + private int itemCount = 0; + + /** + * 项目解决数 + */ + private int itemCloseCount = 0; + + /** + * 项目好评数（满意度评价为非常满意） + */ + private int itemPraiseCount = 0; + + /** + * 社群数 + */ + private int communityCount = 0; + + /** + * 社群成员数 + */ + private int communityMemberCount = 0; + + /** + * 社群话题数 + */ + private int communityTopicCount = 0; + + /** + * 网格长姓名 + */ + private String gridLeader; + + /** + * 企业数 + */ + private int enterpriseCount = 0; + + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java new file mode 100644 index 0000000..6d3e677 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: esua-epdc-cloud + * @description: 网格数量统计Serializable + * @author: wangtong + * @create: 2020-02-11 14:50 + **/ +@Data +public class GriddingCountDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格总计 + **/ + private Integer gridTotle; + + /** + * 开通网格数量 + **/ + private Integer gridCount; + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java new file mode 100644 index 0000000..f10d6d8 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description 党员老龄化排名结果 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class OldMemberRankResultDTO implements Serializable { + /** + * 部门ID + */ + private String deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 党员数 + */ + private Integer partyMemberCount; + /** + * 超过50岁党员数 + */ + private Integer oldMemberCount; + /** + * 比例 + */ + private String proportion; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java new file mode 100644 index 0000000..a258488 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java @@ -0,0 +1,44 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @program: esua-epdc-cloud + * @description: 用户数据统计 + * @author: wangtong + * @create: 2020-02-11 12:14 + **/ +@Data +public class UserAnalysisCountDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 所有用户数 + **/ + private Integer allUserCount; + + /** + * 党员数 + **/ + private Integer partyMemberCount; + + /** + * 居民数 + **/ + private Integer userCount; + + /** + * 党员认证率 + **/ + private BigDecimal partyMemberPercent; + + /** + * 居民认证率 + **/ + private BigDecimal residentPercent; + +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java new file mode 100644 index 0000000..a725e5c --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java @@ -0,0 +1,72 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 用户数据排行 + * + * @author work@yujt.net.cn + * @date 2020/2/11 14:44 + */ +@Data +public class UserDataRankResultDTO { + + /** + * 街道id + */ + private String streetId; + /** + * 街道名称 + */ + private String streetName; + /** + * 用户注册数 + */ + private Integer userCount; + /** + * 男性数 + */ + private Integer maleCount; + /** + * 女性数 + */ + private Integer femaleCount; + /** + * 未知性别数 + */ + private Integer unknownSexCount; + /** + * 居民数（包括认证成功和党员认证居民失败的居民） + */ + private Integer residentCount; + /** + * 未认证用户（根据用户第一次扫码的网格统计） + */ + private Integer unAuthorizedCount = 0; + /** + * 党员数 + */ + private Integer partyMemberCount; + /** + * 老人数（年龄大于50） + */ + private Integer oldCount; + /** + * 年轻人数（年龄不大于50） + */ + private Integer youngCount; + /** + * 老人比例 + */ + private BigDecimal oldPercent; + /** + * 年轻人比例 + */ + private BigDecimal youngPercent; + /** + * 党员认证失败数 + */ + private Integer partyAuthFailureCount; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java new file mode 100644 index 0000000..1ef2d33 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java @@ -0,0 +1,13 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +/** + * 用户注册数据分析 + * + * @author work@yujt.net.cn + * @date 2020/2/11 09:43 + */ +@Data +public class UserRegisterDataResultDTO { +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java new file mode 100644 index 0000000..3fbdb13 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 用户数据排行 + * + * @author work@yujt.net.cn + * @date 2020/2/11 14:44 + */ +@Data +public class UserSortRankResultDTO { + + /** + * 街道id + */ + private String deptId; + /** + * 街道名称 + */ + private String deptName; + /** + * 用户注册数 + */ + private Integer allUserCount; + /** + * 居民数 + */ + private Integer userCount; + /** + * 党员数 + */ + private Integer pattyMemberCount; + + /** + * 党员占比 + */ + private String partyMemberPercent; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java new file mode 100644 index 0000000..ec567d6 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description 党员年轻化排名结果 + * @create 2020-02-11 10:53 上午 + */ +@Data +public class YoungMemberRankResultDTO implements Serializable { + /** + * 部门ID + */ + private String deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 党员数 + */ + private Integer partyMemberCount; + /** + * 超过50岁党员数 + */ + private Integer youngMemberCount; + /** + * 比例 + */ + private String proportion; +} diff --git a/pom.xml b/pom.xml index 403e398..f83fe98 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 榆山党建e家client模块 - + epdc-cloud-analysis-pc-client epdc-cloud-analysis-client epdc-cloud-custom-client epdc-cloud-admin-client