From e4c57663b3554ec16c0b05925e3abe0210970a1a Mon Sep 17 00:00:00 2001 From: zhangfh Date: Sat, 21 Aug 2021 16:19:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E5=85=9A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/EpdcScreenPartyBuildingPartyOrgResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java index 55f6edd..9cd4dc8 100644 --- a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java @@ -52,4 +52,9 @@ public class EpdcScreenPartyBuildingPartyOrgResultDTO implements Serializable { */ private String typeCode; + /** + *党组织类型图标 + */ + private String imgUrl; + } From 632952b6e320eb76c88dd7152e906648e4b10851 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 1 Sep 2021 11:20:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20bug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcAppIdentityDetailFormDTO.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java new file mode 100644 index 0000000..31146a2 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 亮身份详情 + * create time: 2021/8/31$ 14:57$ + */ +@Data +public class EpdcAppIdentityDetailFormDTO implements Serializable { + private static final long serialVersionUID = -951939570282533218L; + + /** + *用户id + */ + private String userId; +} From 163f7a604be9de14b544f9c189a89f62b0ac33e0 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 1 Sep 2021 18:00:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD-pc,=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AB=AFbug=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=E8=A9=B3=E6=83=85=E6=9F=A5=E8=A9=A2=E4=BC=A0=E5=8F=82=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AF=B9=E8=B1=A1=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/UserInfoDTO.java | 122 ++++++++++++++++++ .../form/EpdcAppIdentityDetailFormDTO.java | 22 ++++ .../epdc/form/EpdcAppShowIdentityFormDTO.java | 3 + 3 files changed, 147 insertions(+) create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java create mode 100644 epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java new file mode 100644 index 0000000..90cfd37 --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/UserInfoDTO.java @@ -0,0 +1,122 @@ +/** + * 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 java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 用户信息表 用户信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-31 + */ +@Data +public class UserInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 标识号 + */ + private String id; + + /** + * 用户ID + */ + private String userId; + + /** + * 头像地址 + */ + private String headUrl; + + /** + * 名字 + */ + private String realName; + + /** + * 电话 + */ + private String mobile; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 格言 + */ + private String motto; + + /** + * 承诺 + */ + private String promise; + + /** + * 服务范围 + */ + private String serviceArea; + + /** + * 推荐标识 0-否，1-是 + */ + private String recommendFlag; + + /** + * 推荐时间 + */ + private Date recommendTime; + + /** + * 删除标识 0-否，1-是 + */ + 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-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java new file mode 100644 index 0000000..419350f --- /dev/null +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppIdentityDetailFormDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 亮身份详情 + * create time: 2021/8/31$ 14:57$ + */ +@Data +public class EpdcAppIdentityDetailFormDTO implements Serializable { + private static final long serialVersionUID = -951939570282533218L; + + /** + *用户id + */ + @NotBlank(message = "用户id不能为空") + private String userId; +} diff --git a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java index ad58b6e..3caa982 100644 --- a/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java +++ b/epdc-cloud-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppShowIdentityFormDTO.java @@ -1,7 +1,9 @@ package com.elink.esua.epdc.dto.epdc.form; import lombok.Data; +import lombok.NonNull; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -17,6 +19,7 @@ public class EpdcAppShowIdentityFormDTO implements Serializable { /** *用户ID */ + @NotBlank(message = "用户id不为空") private String userId; /** From 39d049d26c6b30b08ab174e09ca56c142de7dfbf Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 2 Sep 2021 15:13:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20=20=E5=A4=9A=E5=85=83?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=85=9A=E5=91=98=E6=9C=8D=E5=8A=A1=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dcScreenMapPartyMemberServicesFormDTO.java | 28 +++++++++++++++ .../EpdcScreenPartyMemberServicesFormDTO.java | 28 +++++++++++++++ ...ScreenMapPartyMemberServicesResultDTO.java | 32 +++++++++++++++++ .../result/EpdcScreenPartyMemberInfoDTO.java | 35 +++++++++++++++++++ ...pdcScreenPartyMemberServicesResultDTO.java | 31 ++++++++++++++++ 5 files changed, 154 insertions(+) create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenMapPartyMemberServicesFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyMemberServicesFormDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenMapPartyMemberServicesResultDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberInfoDTO.java create mode 100644 epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberServicesResultDTO.java diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenMapPartyMemberServicesFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenMapPartyMemberServicesFormDTO.java new file mode 100644 index 0000000..b4cb85c --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenMapPartyMemberServicesFormDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 多元服务-地图党员服务请求 + * create time: 2021/9/2$ 13:39$ + */ +@Data +public class EpdcScreenMapPartyMemberServicesFormDTO implements Serializable { + private static final long serialVersionUID = 7628513442878722448L; + + /** + * 页码 -必传项 + */ + @NotNull(message = "页码 不能为空") + private Integer pageIndex; + + /** + * 页容量 -必传项 + */ + @NotNull(message = "页容量 不能为空") + private Integer pageSize; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyMemberServicesFormDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyMemberServicesFormDTO.java new file mode 100644 index 0000000..50c27a7 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenPartyMemberServicesFormDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 多元服务-党员服务列表请求 + * create time: 2021/9/2$ 13:34$ + */ +@Data +public class EpdcScreenPartyMemberServicesFormDTO implements Serializable { + private static final long serialVersionUID = -1030908930012346056L; + + /** + * 页码 -必传项 + */ + @NotNull(message = "页码 不能为空") + private Integer pageIndex; + + /** + * 页容量 -必传项 + */ + @NotNull(message = "页容量 不能为空") + private Integer pageSize; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenMapPartyMemberServicesResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenMapPartyMemberServicesResultDTO.java new file mode 100644 index 0000000..ad46ed9 --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenMapPartyMemberServicesResultDTO.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * create by: zhangfenghe + * description: 多元服务-地图党员服务 + * create time: 2021/9/2$ 11:13$ + */ +@Data +public class EpdcScreenMapPartyMemberServicesResultDTO implements Serializable { + + private static final long serialVersionUID = 3885412448938408880L; + + /** + * 话题位置经度 + */ + private String topicLongitude; + + /** + * 话题位置纬度 + */ + private String topicLatitude; + + /** + * 评论人信息 + */ + private List partyMemberInfo; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberInfoDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberInfoDTO.java new file mode 100644 index 0000000..82b95ef --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberInfoDTO.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 多元-地图党员服务-评论人信息 + * create time: 2021/9/2$ 11:18$ + */ +@Data +public class EpdcScreenPartyMemberInfoDTO implements Serializable { + private static final long serialVersionUID = 7024427703183755479L; + + /** + * 评论人姓名 + */ + private String nickName; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 评论内容 + */ + private String content; + + /** + * 评论时间 + */ + private String contentTime; +} diff --git a/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberServicesResultDTO.java b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberServicesResultDTO.java new file mode 100644 index 0000000..6e8b22b --- /dev/null +++ b/epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyMemberServicesResultDTO.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.analysis.pc.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * create by: zhangfenghe + * description: 多元服务-党员服务列表 + * create time: 2021/9/2 11:03 + */ +@Data +public class EpdcScreenPartyMemberServicesResultDTO implements Serializable { + private static final long serialVersionUID = 8941151515678741844L; + + /** + * 用户名 + */ + private String nickName; + + /** + * 用户头像 + */ + private String userAvatar; + + /** + * 服务次数 + */ + private int serviceNum; + +}