Merge remote-tracking branch 'origin/master'

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

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

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<EpdcScreenPartyMemberInfoDTO> partyMemberInfo;
+}

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

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

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

@@ -0,0 +1,122 @@
+/**
+ * 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 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;
+
+
+}

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

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;
 
     /**