新增积分埋点

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRankingFormDTO.java

@@ -0,0 +1,53 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 移动端接口-积分管理模块-积分排行接口入参
+ * @Author zhangyong
+ * @Date 2020-04-29
+ */
+@Data
+public class EpdcAppPointsRankingFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 202029992792275120L;
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+    /**
+     * 排名方式：0-周，1-月
+     */
+    @NotNull(message = "排名方式：0-周，1-月不能为空")
+    private Integer rankingType;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRecordFormDTO.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 移动端接口-积分管理模块-积分记录接口入参
+ * @Author zhangyong
+ * @Date 2020-04-29
+ */
+@Data
+public class EpdcAppPointsRecordFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 202049992792275120L;
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRankingResultDTO.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 移动端接口-积分管理模块-积分排行接口返回值
+ * @Author zhangyong
+ * @Date 2020-04-29
+ */
+@Data
+public class EpdcAppPointsRankingResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3908231797102233188L;
+
+    /**
+     * 积分排行接口返回值 - 前十列表
+     */
+    private List<EpdcAppPointsRankingTopTenDTO> rank;
+
+    /**
+     * 积分排行接口返回值 -用户排名
+     */
+    private EpdcAppPointsRankingUserDTO currentUser;
+
+
+
+}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRecordResultDTO.java

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 移动端接口-积分管理模块-积分记录接口返回值
+ * @Author zhangyong
+ * @Date 2020-04-29
+ */
+@Data
+public class EpdcAppPointsRecordResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 202042992792275120L;
+
+    /**
+     * 积分记录表主键ID
+     */
+    private String id;
+
+    /**
+     * 事件名称
+     */
+    private String ruleDesc;
+
+    /**
+     * 积分操作类型 0-减积分，1-加积分
+     */
+    private Integer operationType;
+
+    /**
+     * 操作积分值
+     */
+    private Integer points;
+
+    /**
+     * 操作时间
+     */
+    private String operationTime;
+}

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java

@@ -79,4 +79,9 @@ public class EpdcEventsDetailDTO implements Serializable {
      * 友邻社群
      */
     private String groupName;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
 }

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java

@@ -157,4 +157,9 @@ public class EpdcEventSubmitFormDTO implements Serializable {
     private Long changeUserId;
     private String changeUsername;
     private String changeUserMobile;
+
+    /**
+     * 事件ID
+     */
+    private String id;
 }

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 /**
  * 审核事件提交表单DTO
+ *
  * @Author LC
  * @Date 2019/9/4 21:11
  */
@@ -38,4 +39,9 @@ public class EpdcEventsReviewFormDTO implements Serializable {
     private String advice;
 
     private List<String> images;
+
+    /**
+     * 发布人ID
+     */
+    private String userId;
 }

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 /**
  * 议题待处理详情DTO
+ *
  * @Author LC
  * @Date 2019/9/6 10:36
  */
@@ -24,6 +25,10 @@ public class IssueWaitHandleDetailDTO implements Serializable {
      * 发布人
      */
     private String nickName;
+    /**
+     * 发布人ID
+     */
+    private String userId;
     /**
      * 发布时间
      */

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java

@@ -36,4 +36,9 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable {
      */
     private List<String> images;
 
+    /**
+     * 发布人
+     */
+    private String userId;
+
 }

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java

@@ -19,6 +19,10 @@ public class WorkIssueDetailResultDTO implements Serializable {
      * 议题ID
      */
     private String id;
+    /**
+     * 用户ID
+     */
+    private String userId;
     /**
      * 事件ID
      */

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java

@@ -24,7 +24,10 @@ public class ItemHandleSubmitFormDTO implements Serializable {
      */
     @NotBlank(message = "项目ID不能为空")
     private String id;
-
+    /**
+     * 发布人ID
+     */
+    private String userId;
     /**
      * 处理意见（内部）
      */

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java

@@ -22,6 +22,10 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      * 项目ID
      */
     private String id;
+    /**
+     * 发布人ID
+     */
+    private String userId;
     /**
      * 发布人
      */

epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@@ -19,6 +19,10 @@ public class ItemDetailResultDTO implements Serializable {
      * 项目ID
      */
     private String id;
+    /**
+     * 用户ID
+     */
+    private String userId;
     /**
      * 事件ID
      */

epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java

@@ -6,7 +6,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- *
  * 社群审核详情DTO
  *
  * @Author：liuchuang
@@ -40,4 +39,9 @@ public class GroupDetailDTO implements Serializable {
      * 群主
      */
     private String nickname;
+
+    /**
+     * 群主ID
+     */
+    private String userId;
 }

epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java

@@ -8,7 +8,6 @@ import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
- *
  * 创建社群DTO
  *
  * @Author：liuchuang
@@ -96,4 +95,9 @@ public class GroupCreateFormDTO implements Serializable {
      * 群主信息
      */
     private GroupUserFormDTO groupUserFormDTO;
+
+    /**
+     * 社群ID
+     */
+    private String id;
 }

epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java

@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- *
  * 发布话题Form DTO
  *
  * @Author：liuchuang
@@ -19,6 +18,11 @@ import java.util.List;
 public class TopicSubmitFormDTO implements Serializable {
     private static final long serialVersionUID = 7888315361241643792L;
 
+    /**
+     * 话题ID  - 返参
+     */
+    private String id;
+
     /**
      * 话题内容
      */

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsBrowseFromDTO.java

@@ -20,4 +20,6 @@ public class EpdcNewsBrowseFromDTO implements Serializable {
 
     @NotNull(message = "新闻id不能为空")
     private String newsId;
+
+    private String userId;
 }

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsGradeDTO.java

@@ -0,0 +1,87 @@
+/**
+ * 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;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ *  
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-04-29
+ */
+@Data
+public class PointsGradeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 等级系数
+     */
+	private Integer grade;
+
+    /**
+     * 积分系数
+     */
+	private Integer points;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 删除标识（0-否，1-是）
+     */
+	private String delFlag;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -206,6 +206,11 @@ public class UserDTO implements Serializable {
      */
     private Integer points;
 
+    /**
+     * 用户累计积分
+     */
+    private Integer pointsTotle;
+
     /**
      * 邀请人ID
      */

epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java

@@ -21,4 +21,14 @@ public class EpdcUserInfoResultDTO implements Serializable {
     private String faceImg;
     private String partyFlag;
 
+    /**
+     * 用户积分
+     */
+    private Integer points;
+
+    /**
+     * 用户积分等级
+     */
+    private Integer grade;
+
 }