diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java new file mode 100644 index 0000000..1d87978 --- /dev/null +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java @@ -0,0 +1,95 @@ +/** + * 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 elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Data +public class ResidentConfigDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 配置类型 + */ + private String residentType; + + /** + * 配置编码 + */ + private String residentCode; + + /** + * 配置内容 + */ + private String residentValue; + + /** + * 排序 + */ + private String sort; + + /** + * 删除标识 0:未删除,1:删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java new file mode 100644 index 0000000..b6e8edd --- /dev/null +++ b/epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * APP 获取局面端配置 + * + * @author songyunpeng + * @date 2020/06/08 18:30 + */ +@Data +public class ResidentConfigResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 类型 + */ + private String residentType; + + /** + * 值 + */ + private String residentValue; + + /** + * 编码 + */ + private String residentCode; +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java new file mode 100644 index 0000000..8702c59 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java @@ -0,0 +1,128 @@ +/** + * 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; + + +/** + * 用户信息表 + * + * @author songyunpeng + * @since v1.0.0 2019-09-02 + */ +@Data +public class UserPointsDTO implements Serializable { + + private static final long serialVersionUID = 915598602233599300L; + + /** + * 主键 + */ + private String id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 手机号 + */ + private String mobile; + + /** + * 电话 + */ + private String telephone; + + + + /** + * 真实姓名 + */ + private String realName; + + + + /** + * 居民住址 + */ + private String address; + + + + /** + * 用户积分 + */ + private Integer points; + + /** + * 用户累计积分 + */ + private Integer pointsTotle; + + + /** + * 社区 + */ + private String communityName; + + /** + * 社区ID + */ + private Long communityId; + + /** + * 网格 + */ + private String gridName; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 居住网格id + */ + private Long deptId; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserGradeRankingFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserGradeRankingFormDTO.java new file mode 100644 index 0000000..fe9c742 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserGradeRankingFormDTO.java @@ -0,0 +1,58 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 移动端接口-用户管理模块-积分记录-等级排名接口 入参 + * + * @Author zhangyong + * @Date 2020-06-24 + */ +@Data +public class EpdcAppUserGradeRankingFormDTO 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; + + /** + * 用户ID + */ + private String userId; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 街道ID + */ + private Long streetId; + + /** + * 用户累计积分 + */ + private Integer pointsTotle; + +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserRankingFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserRankingFormDTO.java new file mode 100644 index 0000000..40feb86 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserRankingFormDTO.java @@ -0,0 +1,70 @@ +package com.elink.esua.epdc.dto.epdc.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; + +/** + * 移动端接口-用户模块-用户积分排行接口入参 + * + * @Author zhangyong + * @Date 2020-06-01 + */ +@Data +public class EpdcAppUserRankingFormDTO 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 realName; + + /** + * 网格id / 街道id + */ + private Long deptId; + + /** + * 用户积分 + */ + private Integer points; + + /** + * 当前部门(网格/街道)下的,所有用户ID + */ + private List allUserIdByDept; +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppRankingUserDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppRankingUserDTO.java new file mode 100644 index 0000000..4fc7a6c --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppRankingUserDTO.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 移动端接口-用户模块-积分排行接口返回值 - 用户排名信息 + * @Author zhangyong + * @Date 2020-06-01 + */ +@Data +public class EpdcAppRankingUserDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * 用户ID + */ + private String userId; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 积分 + */ + private Integer points; + + /** + * 用户个人排名 + */ + private Integer rank; +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppUserGradeRankingResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppUserGradeRankingResultDTO.java new file mode 100644 index 0000000..8cdab05 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppUserGradeRankingResultDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 移动端接口-用户管理模块-积分记录-等级排名接口 返回值 + * + * @Author zhangyong + * @Date 2020-06-24 + */ +@Data +public class EpdcAppUserGradeRankingResultDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * 积分排行-等级排名接口返回值 - 前二十列表 + */ + private List rank; + + /** + * 积分排行-等级排名接口返回值 -用户等级 + */ + private UsersGradeRankingDTO currentUser; + + +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppUserRankingResultDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppUserRankingResultDTO.java new file mode 100644 index 0000000..58c948f --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppUserRankingResultDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 移动端接口-用户模块-积分排行接口返回值 + * + * @Author zhangyong + * @Date 2020-06-01 + */ +@Data +public class EpdcAppUserRankingResultDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * 积分排行接口返回值 - 前十列表 + */ + private List rank; + + /** + * 积分排行接口返回值 -用户排名 + */ + private EpdcAppRankingUserDTO currentUser; + + +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UsersGradeRankingDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UsersGradeRankingDTO.java new file mode 100644 index 0000000..12a9684 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UsersGradeRankingDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 移动端接口-用户管理模块-积分记录-等级排名接口 具体返回值 + * + * @Author zhangyong + * @Date 2020-06-24 + */ +@Data +public class UsersGradeRankingDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * 用户ID + */ + private String userId; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户等级 + */ + private Integer grade; + + /** + * 取排行榜 名次 + */ + private Integer rank; +}