From 4f1b2b418644d5a8c8e36574aca7525acd7f4bef Mon Sep 17 00:00:00 2001 From: yujt Date: Wed, 9 Sep 2020 09:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86=E5=9F=8B?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/EpdcAppPointsRankingFormDTO.java | 53 +++++++++++ .../dto/form/EpdcAppPointsRecordFormDTO.java | 42 +++++++++ .../result/EpdcAppPointsRankingResultDTO.java | 30 +++++++ .../result/EpdcAppPointsRecordResultDTO.java | 41 +++++++++ .../epdc/dto/events/EpdcEventsDetailDTO.java | 5 ++ .../events/form/EpdcEventSubmitFormDTO.java | 5 ++ .../events/form/EpdcEventsReviewFormDTO.java | 6 ++ .../dto/issue/IssueWaitHandleDetailDTO.java | 5 ++ .../form/IssueWaitHandleSubmitFormDTO.java | 5 ++ .../result/WorkIssueDetailResultDTO.java | 4 + .../item/form/ItemHandleSubmitFormDTO.java | 5 +- .../result/ItemDetailForPCEndResultDTO.java | 4 + .../dto/item/result/ItemDetailResultDTO.java | 4 + .../dto/group/GroupDetailDTO.java | 6 +- .../dto/group/form/GroupCreateFormDTO.java | 6 +- .../dto/topic/form/TopicSubmitFormDTO.java | 6 +- .../dto/epdc/form/EpdcNewsBrowseFromDTO.java | 2 + .../elink/esua/epdc/dto/PointsGradeDTO.java | 87 +++++++++++++++++++ .../java/com/elink/esua/epdc/dto/UserDTO.java | 5 ++ .../epdc/result/EpdcUserInfoResultDTO.java | 10 +++ 20 files changed, 327 insertions(+), 4 deletions(-) create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRankingFormDTO.java create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRecordFormDTO.java create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRankingResultDTO.java create mode 100644 epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRecordResultDTO.java create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsGradeDTO.java diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRankingFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRankingFormDTO.java new file mode 100644 index 0000000..2f09a1a --- /dev/null +++ b/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; +} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRecordFormDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppPointsRecordFormDTO.java new file mode 100644 index 0000000..9130025 --- /dev/null +++ b/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; + +} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRankingResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRankingResultDTO.java new file mode 100644 index 0000000..e11f352 --- /dev/null +++ b/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 rank; + + /** + * 积分排行接口返回值 -用户排名 + */ + private EpdcAppPointsRankingUserDTO currentUser; + + + +} diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRecordResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppPointsRecordResultDTO.java new file mode 100644 index 0000000..c95a429 --- /dev/null +++ b/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; +} diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java index ee80242..9ae9843 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java +++ b/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; } diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java index 3fe1cb2..43ceef2 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java +++ b/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; } diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java index 104e371..e7439dd 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java +++ b/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 images; + + /** + * 发布人ID + */ + private String userId; } diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java index e9c04bf..c3854b5 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java +++ b/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; /** * 发布时间 */ diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java index 696c75b..2ae127d 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java +++ b/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 images; + /** + * 发布人 + */ + private String userId; + } diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java index 3031a47..1829d38 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java +++ b/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 */ diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index e5fd3cc..eaa9f7e 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/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; /** * 处理意见（内部） */ diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java index ff0453e..5fce8f3 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java +++ b/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; /** * 发布人 */ diff --git a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index 541da97..2052f0c 100644 --- a/epdc-cloud-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/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 */ diff --git a/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java b/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java index d5148ca..e2ebb53 100644 --- a/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupDetailDTO.java +++ b/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; } diff --git a/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java b/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java index 3224805..1a26573 100644 --- a/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/group/form/GroupCreateFormDTO.java +++ b/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; } diff --git a/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java b/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java index 6027625..8426ec8 100644 --- a/epdc-cloud-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java +++ b/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; + /** * 话题内容 */ diff --git a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsBrowseFromDTO.java b/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsBrowseFromDTO.java index 031dcb7..e1d5b73 100644 --- a/epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsBrowseFromDTO.java +++ b/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; } diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsGradeDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsGradeDTO.java new file mode 100644 index 0000000..2bfae11 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/PointsGradeDTO.java @@ -0,0 +1,87 @@ +/** + * 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; + +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; + +} \ No newline at end of file diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java index f69f216..66b40b4 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java +++ b/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 */ diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index 5a8f24e..e36671a 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/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; + }