diff --git a/epdc-analysis-client/pom.xml b/epdc-analysis-client/pom.xml deleted file mode 100644 index 21920b7..0000000 --- a/epdc-analysis-client/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - com.esua.epdc.yushan - epdc-cloud-client-yushan - 1.0.0 - - - epdc-analysis-client - jar - 市北党群e家微服务分析模块客户端 - - - - com.esua.epdc.yushan - epdc-commons-tools - ${epdc-cloud-commons.version} - - - - - ${project.artifactId} - - - diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java b/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java deleted file mode 100644 index d2bed54..0000000 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java +++ /dev/null @@ -1,48 +0,0 @@ -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-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java b/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java deleted file mode 100644 index c3b3d37..0000000 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * 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-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java b/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java deleted file mode 100644 index be8c514..0000000 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * 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-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java b/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java deleted file mode 100644 index 52f3b71..0000000 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * 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-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java deleted file mode 100644 index b4fb1ec..0000000 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.dto.user.form; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -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; -} diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java b/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java deleted file mode 100644 index 3762374..0000000 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java +++ /dev/null @@ -1,81 +0,0 @@ -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-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/HotIssueFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/HotIssueResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueClassifiedStatisticDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java diff --git a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java index b80325f..d2bed54 100644 --- a/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java +++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java @@ -2,50 +2,47 @@ package com.elink.esua.epdc.dto.item.form; import lombok.Data; -import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; /** - * 最热项目接口 -参数 - * @author mgq - * @Data 2020/02/25 + * @Description 最热项目接口DTO + * @Author zy + * @Date 2020/2/12 */ @Data public class HotItemListFormDTO implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 6145783947444092507L; /** - * 部门Id - */ - private String deptId; - /** - * 页码，从1开始 + * 页码 */ @Min(value = 1, message = "页码必须大于0") - private int pageIndex; + private Integer pageIndex; + /** - * 页容量，默认10页 + * 页容量，默认5页 */ - @Min(value = 1, message = "每页条数必须大于必须大于0") - private int pageSize = 10; + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + /** - * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年） + * 第一页查询发起时的时间 */ - @Min(value = 1, message = "数据时间类型大于0") - @Max(value = 4, message = "数据时间类型小于5") - private Integer someMonthsType; + @NotBlank(message = "时间戳不能为空") + private String timestamp; /** - * 时间 + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年） */ - - private String startTime; + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType; /** - * 部门数据权限 + * 部门ID列表 */ - private List deptIdList; + List deptIdList; } diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/HotItemListResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/HotTopicResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/UserAnalysisDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/MemberRankFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserCountDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserRegisterDataFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/UserSortRankFormDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java similarity index 86% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java index 42d92ff..6f2530e 100644 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java +++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -26,7 +26,7 @@ public class GridOpeningResultDTO implements Serializable { */ private int registerCount = 0; /** - * 居民数（包括认证成功和认证失败的居民） + * 认证居民 */ private int residentCount = 0; @@ -35,11 +35,6 @@ public class GridOpeningResultDTO implements Serializable { */ private int partyCount = 0; - /** - * 未认证用户（根据用户第一次扫码的网格统计） - */ - private Integer unAuthorizedCount = 0; - /** * 居民扫码数 */ @@ -66,7 +61,7 @@ public class GridOpeningResultDTO implements Serializable { private int itemCount = 0; /** - * 项目解决数 + * 项目结案数 */ private int itemCloseCount = 0; diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/OldMemberRankResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java similarity index 85% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java index f215ae9..ddc4c2b 100644 --- a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java +++ b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java @@ -38,13 +38,9 @@ public class UserDataRankResultDTO { */ private Integer unknownSexCount; /** - * 居民数（包括认证成功和认证失败的居民） + * 居民数 */ private Integer residentCount; - /** - * 未认证用户（根据用户第一次扫码的网格统计） - */ - private Integer unAuthorizedCount = 0; /** * 党员数 */ diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserRegisterDataResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserSortRankResultDTO.java diff --git a/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java b/epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java similarity index 100% rename from epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java rename to epdc-cloud-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/YoungMemberRankResultDTO.java diff --git a/pom.xml b/pom.xml index 7684d13..403e398 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 榆山党建e家client模块 - epdc-analysis-client + epdc-cloud-analysis-client epdc-cloud-custom-client epdc-cloud-admin-client