数据分析模块dto初始化

(cherry picked from commit 2b07057e7215bb202713cdd983232b4b97536e62)

epdc-analysis-client/pom.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.esua.epdc.yushan</groupId>
-        <artifactId>epdc-cloud-client-yushan</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>epdc-analysis-client</artifactId>
-    <packaging>jar</packaging>
-    <description>市北党群e家微服务分析模块客户端</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.esua.epdc.yushan</groupId>
-            <artifactId>epdc-commons-tools</artifactId>
-            <version>${epdc-cloud-commons.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotItemListFormDTO.java

@@ -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<Long> deptIdList;
-}

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java

@@ -1,146 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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;
-
-}

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserPartyRankDTO.java

@@ -1,127 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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;
-
-}

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserRegisterRankDTO.java

@@ -1,137 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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;
-
-}

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java

@@ -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<Long[]> allDeptIdsShow;
-
-    private List<Long> allStreetIds;
-
-    private String endTime;
-}

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/ExportOperationDataResultDTO.java

@@ -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;
-
-}

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;
 
 /**
- * 最热项目接口 -参数
+ * @Description 最热项目接口DTO
- * @author  mgq
+ * @Author zy
- * @Data 2020/02/25
+ * @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")
+    @Min(value = 1, message = "每页条数必须大于0")
-    private int pageSize = 10;
+    private Integer pageSize;
+
     /**
-     * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）
+     * 第一页查询发起时的时间
      */
-    @Min(value = 1, message = "数据时间类型大于0")
+    @NotBlank(message = "时间戳不能为空")
-    @Max(value = 4, message = "数据时间类型小于5")
+    private String timestamp;
-    private Integer someMonthsType;
 
     /**
-     * 时间
+     * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）
      */
-
+    @NotNull(message = "数据时间类型不能为空")
-    private String startTime;
+    private Integer someMonthsType;
 
     /**
-     * 部门数据权限
+     * 部门ID列表
      */
-    private List<Long> deptIdList;
+    List<Long> deptIdList;
 }

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java → 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;
 

epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java → 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;
     /**
      * 党员数
      */

pom.xml

@@ -16,7 +16,7 @@
     <description>榆山党建e家client模块</description>
 
     <modules>
-        <module>epdc-analysis-client</module>
+<!--        <module>epdc-analysis-client</module>-->
         <module>epdc-cloud-analysis-client</module>
         <module>epdc-cloud-custom-client</module>
         <module>epdc-cloud-admin-client</module>