微笑榆山功能开发 / 社群功能初始化，client。

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/MenuNoticeDTO.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 菜单通知DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/29 17:03
+ */
+@Data
+public class MenuNoticeDTO implements Serializable {
+    private static final long serialVersionUID = -9183650682608160248L;
+
+    /**
+     * 菜单编码
+     */
+    private String menuCode;
+
+    /**
+     * 通知部门
+     */
+    private Long deptId;
+
+    /**
+     * 消息数量
+     */
+    private Integer num;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/WorkWxMaSubscribeData.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 订阅消息数据
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/29 18:56
+ */
+@Data
+public class WorkWxMaSubscribeData implements Serializable {
+    private static final long serialVersionUID = 1321779871459769246L;
+
+    private String name;
+    private String value;
+    private String color;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/WorkWxMaSubscribeMessage.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 工作端发送小程序订阅消息数据
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/27 18:27
+ */
+@Data
+public class WorkWxMaSubscribeMessage implements Serializable {
+    private static final long serialVersionUID = -4351727465830321653L;
+
+    /**
+     * 消息订阅者
+     */
+    private List<String> toUsers;
+
+    /**
+     * 消息数据
+     */
+    private List<WorkWxMaSubscribeData> data;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryTreeDTO.java

@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.dto.category;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2019/12/3 14:34
+ */
+@Data
+public class CategoryTreeDTO implements Serializable {
+
+	private static final long serialVersionUID = 8751086975269527708L;
+	/**
+	 * id
+	 */
+	private Long id;
+	/**
+	 * 上级分类ID
+	 */
+	private Long pid;
+
+	/**
+	 * 分类名称
+	 */
+	private String categoryName;
+
+	private String value;
+
+	private String label;
+
+	private List<CategoryTreeDTO> children;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/EpdcCommentsAndAttitudeFromTopicFormDTO.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 话题评论、评论支持反对数据
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/12 14:17
+ */
+@Data
+public class EpdcCommentsAndAttitudeFromTopicFormDTO implements Serializable {
+    private static final long serialVersionUID = 8779307899428155354L;
+
+    /**
+     * 评论
+     */
+    private List<EventCommentDTO> comments;
+
+    /**
+     * 表态
+     */
+    private List<EventCommentUserAttitudeDTO> attitudes;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java

@@ -0,0 +1,156 @@
+/**
+ * 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.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 事件评论表 事件评论表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-09-09
+ */
+@Data
+public class EventCommentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 事件ID
+     */
+	private String eventId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 项目ID
+     */
+    private String itemId;
+
+    /**
+     * 评论人ID
+     */
+	private String userId;
+
+    /**
+     * 评论人昵称
+     */
+	private String userName;
+
+    /**
+     * 评论人头像
+     */
+	private String userFace;
+
+    /**
+     * 评论内容
+     */
+	private String content;
+
+    /**
+     * 评论类型 0：评论，1：回复，2：回复的回复
+     */
+	private String commentType;
+
+    /**
+     * 回复的评论ID
+     */
+	private String commentId;
+
+    /**
+     * 被回复数
+     */
+	private Integer replyCount;
+
+    /**
+     * 被回复人ID
+     */
+	private String replyUserId;
+
+    /**
+     * 被回复人名称
+     */
+	private String replyUserName;
+
+    /**
+     * 被回复人头像
+     */
+	private String replyUserFace;
+
+    /**
+     * 点赞数
+     */
+	private Integer likeCount;
+
+    /**
+     * 点踩数
+     */
+	private Integer unLikeCount;
+
+    /**
+     * 删除标识 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+	/**
+	 * 党员标识 0-否，1-是
+	 */
+	private String partyFlag;
+
+	/**
+	 * 屏蔽标识 0：未屏蔽，1：已屏蔽
+	 */
+	private String shieldFlag;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeDTO.java

@@ -0,0 +1,86 @@
+/**
+ * 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.comment;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 事件评论点赞点踩表 事件评论点赞点踩表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-09-09
+ */
+@Data
+public class EventCommentUserAttitudeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 事件评论ID
+     */
+	private String eventCommentId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户点赞点踩标识 0：取消点赞，1：点赞
+     */
+	private String attitudeFlag;
+
+    /**
+     * 删除标识 0：未删除，1：删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentDTO.java

@@ -0,0 +1,146 @@
+/**
+ * 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.comment;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 话题评论表 话题评论表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-10-23
+ */
+@Data
+public class TopicCommentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 话题ID
+     */
+	private String topicId;
+
+    /**
+     * 评论人ID
+     */
+	private String userId;
+
+    /**
+     * 评论人昵称
+     */
+	private String username;
+
+    /**
+     * 评论人头像
+     */
+	private String userFace;
+
+    /**
+     * 评论内容
+     */
+	private String content;
+
+    /**
+     * 评论类型 0：评论，1：回复，2：回复的回复
+     */
+	private String commentType;
+
+    /**
+     * 回复的评论ID
+     */
+	private String commentId;
+
+    /**
+     * 被回复数
+     */
+	private Integer replyCount;
+
+    /**
+     * 被回复人ID
+     */
+	private String replyUserId;
+
+    /**
+     * 被回复人名称
+     */
+	private String replyUsername;
+
+    /**
+     * 被回复人头像
+     */
+	private String replyUserFace;
+
+    /**
+     * 点赞数
+     */
+	private Integer likeCount;
+
+    /**
+     * 点踩数
+     */
+	private Integer unLikeCount;
+
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+	private String shieldFlag;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+	/**
+	 * PARTY_FLAG 党员标识（0-否，1-是）
+	 */
+	private String partyFlag;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentFormDTO.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.comment;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 评论议题、提交评论
+ *
+ */
+@Data
+public class TopicCommentFormDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    private String topicId;
+
+    private String faCommentId;
+
+    @Size(min = 1, max = 500, message = "评论内容不能超过500字")
+    private String content;
+
+    /**
+     * 评论人ID
+     */
+    @NotBlank(message = "评论人ID不能为空")
+    private String userId;
+
+    /**
+     * 评论人昵称
+     */
+    private String userName;
+
+    /**
+     * 评论人头像
+     */
+    private String userFace;
+
+    /**
+     * 党员标识 0：否，1：是
+     */
+    private String partyFlag;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentListDTO.java

@@ -0,0 +1,62 @@
+package com.elink.esua.epdc.dto.comment;
+
+import com.elink.esua.epdc.dto.topic.ReplyCommentDto;
+import com.elink.esua.epdc.dto.topic.UserBaseInfoDto;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author：liuchuang
+ * @Date：2019/11/12 10:55
+ */
+@Data
+public class TopicCommentListDTO implements Serializable {
+    private static final long serialVersionUID = 1678760230045285655L;
+
+    /**
+     * 评论ID
+     */
+    private String commentId;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 用户是否赞过，false未赞
+     */
+    private boolean userLike;
+    /**
+     * 用户是否踩过，true踩
+     */
+    private boolean userDislike;
+    /**
+     * 评论时间
+     */
+    private Date commentTime;
+    /**
+     * 赞数
+     */
+    private Integer approveNum;
+    /**
+     * 踩数
+     */
+    private Integer opposeNum;
+    /**
+     * 表态次数
+     */
+    private Integer attitudeNum;
+    /**
+     * 用户信息
+     */
+    private UserBaseInfoDto user;
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+    private String shieldFlag;
+    /**
+     * 回复评论信息
+     */
+    private ReplyCommentDto replyComment;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentStatementFormDTO.java

@@ -0,0 +1,47 @@
+/**
+ * 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.comment;
+
+import java.io.Serializable;
+import lombok.Data;
+
+
+@Data
+public class TopicCommentStatementFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表态 0赞；1踩；2取消点赞；3取消点踩
+     */
+	private String attitude;
+
+    /**
+     * 评论ID
+     */
+    private String commentId;
+
+    private String topicId;
+
+    private String useId;
+
+    private String userName;
+
+
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentUserAttitudeDTO.java

@@ -0,0 +1,86 @@
+/**
+ * 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.comment;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 话题评论用户表态表 话题评论用户表态表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-10-23
+ */
+@Data
+public class TopicCommentUserAttitudeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 评论ID
+     */
+	private String commentId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 表态标识 0：点赞，1：点踩
+     */
+	private String attitudeFlag;
+
+    /**
+     * 删除标记 0：未删除，1：删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentsFormDTO.java

@@ -0,0 +1,43 @@
+package com.elink.esua.epdc.dto.comment;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 移动端评论表单DTO
+ * @Author LC
+ * @Date 2019/9/9 15:09
+ */
+@Data
+public class TopicCommentsFormDTO implements Serializable {
+    private static final long serialVersionUID = -3804142943077174555L;
+
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空")
+    private Integer pageIndex;
+    /**
+     * 页容量
+     */
+    @NotNull(message = "分页数量不能为空")
+    private Integer pageSize;
+    /**
+     * 时间戳(yyyy-MM-dd HH:mm:ss)
+     */
+    private String timestamp;
+    /**
+     * 列表类型 0最新；1最热
+     */
+    @NotBlank(message = "列表类型不能为空")
+    private String orderType;
+
+    private String topicId;
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicCommentsResultDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.comment;
+
+import com.elink.esua.epdc.dto.topic.TopicCommentsDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 移动端评论列表DTO
+ * @Author LC
+ * @Date 2019/9/9 14:46
+ */
+@Data
+public class TopicCommentsResultDTO implements Serializable {
+    private static final long serialVersionUID = -5087234859322214256L;
+
+    /**
+     * 表态数
+     */
+    private long statementNum;
+
+    /**
+     * 评论
+     */
+    List<TopicCommentsDTO> commentsList;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/TopicDeleteCommentsFormDTO.java

@@ -0,0 +1,16 @@
+package com.elink.esua.epdc.dto.comment;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2019/11/12 11:06
+ */
+@Data
+public class TopicDeleteCommentsFormDTO implements Serializable {
+    private static final long serialVersionUID = -8359841146893592752L;
+
+    private String[] commentIds;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java

@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.comment.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 评论议题、提交评论
+ *
+ */
+@Data
+public class CommentFormDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    private String issueId;
+
+    private String itemId;
+
+    //父评论（被评论）ID
+    private String faCommentId;
+
+    @Size(min = 1, max = 500, message = "评论内容不能超过500字")
+    private String content;
+
+    /**
+     * 评论人ID
+     */
+    @NotBlank(message = "评论人ID不能为空")
+    private String userId;
+
+    /**
+     * 评论人昵称
+     */
+    private String userName;
+
+    /**
+     * 评论人头像
+     */
+    private String userFace;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/form/EventCommentsFormDTO.java

@@ -0,0 +1,53 @@
+package com.elink.esua.epdc.dto.comment.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 移动端评论表单DTO
+ * @Author LC
+ * @Date 2019/9/9 15:09
+ */
+@Data
+public class EventCommentsFormDTO implements Serializable {
+    private static final long serialVersionUID = -3804142943077174555L;
+
+    /**
+     * 页码
+     */
+    @NotNull(message = "页码不能为空")
+    private Integer pageIndex;
+    /**
+     * 页容量
+     */
+    @NotNull(message = "分页数量不能为空")
+    private Integer pageSize;
+    /**
+     * 列表类型 0最新；1最热
+     */
+    @NotBlank(message = "列表类型不能为空")
+    private String orderType;
+    /**
+     * 时间戳(yyyy-MM-dd HH:mm:ss)
+     */
+    private String timestamp;
+    /**
+     * 项目ID
+     */
+    private String itemId;
+    /**
+     * 议题ID
+     */
+    private String issueId;
+    /**
+     * 事件ID
+     */
+    private String eventId;
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java

@@ -0,0 +1,50 @@
+package com.elink.esua.epdc.dto.comment.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * @Description 议题提交评论DTO
+ * @Author yinzuomei
+ * @Date 2019/12/18 16:56
+ */
+@Data
+public class SubmitCommentFormDTO implements Serializable {
+	private static final long serialVersionUID = -3253699905608729529L;
+
+	private String issueId;
+
+	private String itemId;
+
+	/**
+	 * 父评论（被评论）ID
+	 */
+	private String faCommentId;
+
+	@Size(min = 1, max = 500, message = "评论内容不能超过500字")
+	private String content;
+
+	/**
+	 * 评论人ID
+	 */
+	@NotBlank(message = "评论人ID不能为空")
+	private String userId;
+
+	/**
+	 * 评论人昵称
+	 */
+	private String userName;
+
+	/**
+	 * 评论人头像
+	 */
+	private String userFace;
+
+	/**
+	 * 党员标识（0-否，1-是）
+	 */
+	private String partyFlag;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.comment.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 事件评论回复列表接口
+ *
+ */
+@Data
+public class WorkCommentReplyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String commentId;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/result/EventCommentsResultDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 移动端评论列表DTO
+ * @Author LC
+ * @Date 2019/9/9 14:46
+ */
+@Data
+public class EventCommentsResultDTO implements Serializable {
+    private static final long serialVersionUID = -5087234859322214256L;
+
+    /**
+     * 表态数
+     */
+    private long statementNum;
+
+    /**
+     * 评论
+     */
+    List<EpdcEventsCommentsDTO> commentsList;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkEventsCommentsDTO.java

@@ -0,0 +1,53 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 事件评论DTO
+ * @Author LC
+ * @Date 2019/9/6 17:20
+ */
+@Data
+public class WorkEventsCommentsDTO implements Serializable {
+    private static final long serialVersionUID = 2112619345374657409L;
+
+
+    /**
+     * 评论人昵称
+     */
+    private String userName;
+
+    /**
+     * 评论人头像
+     */
+    private String userFace;
+
+    /**
+     *评论时间
+     */
+    private Date createdTime;
+
+    /**
+     *评论内容
+     */
+    private String content;
+
+    /**
+     *点赞数
+     */
+    private String likeCount;
+
+    /**
+     *点踩数
+     */
+    private String unLikeCount;
+
+    /**
+     * 回复列表
+     */
+    private List<WorkReplyCommentDTO> replies;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/comment/result/WorkReplyCommentDTO.java

@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 被回复的评论
+ * @Author LC
+ * @Date 2019/9/6 17:25
+ */
+@Data
+public class WorkReplyCommentDTO implements Serializable {
+    private static final long serialVersionUID = 3501567846629315395L;
+
+
+    /**
+     *回复人昵称
+     */
+    private String replyUserName;
+
+    /**
+     *回复人头像
+     */
+    private String replyUserFace;
+
+    /**
+     *回复时间
+     */
+    private Date createdTime;
+
+    /**
+     *回复内容
+     */
+    private String content;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupConstant.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.constant;
+
+/**
+ *
+ * 友邻社群常量
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/21 14:12
+ */
+public interface GroupConstant {
+
+    /**
+     * 网格党员群名称后缀
+     */
+    String PARTY_GROUP_NAME_SUFFIX = "党员群";
+
+    /**
+     * 网格党员群默认头像
+     */
+//    String PARTY_GROUP_AVATAR = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_party_group_avatar.png";
+    String PARTY_GROUP_AVATAR = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/7B/rBAAM15GnOSAcCAXAAALfDaRKu0301.png";
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupNoticeConstant.java

@@ -0,0 +1,161 @@
+package com.elink.esua.epdc.dto.constant;
+
+/**
+ *
+ * 发送消息常量
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 13:41
+ */
+public interface GroupNoticeConstant {
+
+    /**
+     * 社群审核未通过
+     */
+    String NOTICE_GROUP_NOT_PASSED = "您创建的社群【审核未通过】";
+
+    /**
+     * 社群审核通过
+     */
+    String NOTICE_GROUP_PASSED = "您创建的社群【审核通过】";
+
+    /**
+     * 社群解散
+     */
+    String NOTICE_GROUP_DISBAND = "您所在的社群已被解散";
+
+    /**
+     * 删除社群成员
+     */
+    String NOTICE_GROUP_USER_REMOVED_MEMBER = "您已被群主移除社群";
+
+    /**
+     * 邀请入群
+     */
+    String NOTICE_GROUP_USER_INVITED = "您已加入社群";
+
+    /**
+     * 邀请入群内容
+     */
+    String NOTICE_GROUP_USER_INVITED_CONTENT = "您已被群主邀请加入groupName社群，快进入社群看看吧。";
+
+    /**
+     * 入群申请通过
+     */
+    String NOTICE_GROUP_USER_REVIEW_PASSED = "入群申请【审核通过】";
+
+    /**
+     * 入群申请不通过
+     */
+    String NOTICE_GROUP_USER_REVIEW_NOT_PASSED = "入群申请【审核不通过】";
+
+    /**
+     * 入群申请通过内容
+     */
+    String NOTICE_GROUP_USER_REVIEW_PASSED_CONTENT = "您加入groupName社群的申请，审核已通过，快进入社群吧。";
+
+    /**
+     * 入群申请不通过内容
+     */
+    String NOTICE_GROUP_USER_REVIEW_NOT_PASSED_CONTENT = "您加入groupName社群的申请，审核未通过，原因：auditOpinion";
+
+    /**
+     * 退出社群
+     */
+    String NOTICE_GROUP_QUIT = "已退出社群";
+
+    /**
+     * 话题关闭
+     */
+    String NOTICE_GROUP_TOPIC_CLOSED = "话题关闭";
+
+    /**
+     * 转议题-不通过
+     */
+    String NOTICE_TOPIC_TO_ISSUE_NOT_PASS = "转议题【审核不通过】";
+
+    /**
+     * 转议题-通过
+     */
+    String NOTICE_TOPIC_TO_ISSUE_PASS = "转议题";
+
+    /**
+     * 转议题-通过-内容-群主
+     */
+    String NOTICE_TOPIC_TO_ISSUE_PASS_LORD_CONTENT = "您转报的话题已经审核通过并成为议题，可在“党群议事”查看。";
+
+    /**
+     * 转议题-通过-内容-发布话题用户
+     */
+    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经被群主转成议题，可在党群议事查看。";
+
+    /**
+     * 我的消息类型：0审核通知
+     */
+    String NOTICE_TYPE_AUDIT_NOTICE = "0";
+
+    /**
+     * 我的消息类型：1互动通知
+     */
+    String NOTICE_TYPE_INTERACTIVE_NOTICE = "1";
+
+    /**
+     * 我的消息类型：2进度通知
+     */
+    String NOTICE_TYPE_PROGRESS_NOTICE = "2";
+
+    /**
+     * 我的消息类型：3社群通知
+     */
+    String NOTICE_TYPE_GROUP_NOTICE = "3";
+
+    /**
+     * 消息所属业务类型：社群审核通过
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_PASSED = "groupPassed";
+
+    /**
+     * 消息所属业务类型：社群审核未通过或解散
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_NOT_PASSED_OR_DISBAND = "groupNotPassedOrDisband";
+
+    /**
+     * 消息所属业务类型：移除社群成员
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REMOVED_MEMBER = "groupRemovedMember";
+
+    /**
+     * 消息所属业务类型：退出社群
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_QUIT = "groupQuit";
+
+    /**
+     * 社群邀请
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_INVITED = "groupInvited";
+
+    /**
+     * 入群申请通过
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_PASSED = "groupUserReviewPassed";
+
+    /**
+     * 入群申请未通过
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_USER_REVIEW_NOT_PASS = "groupUserReviewNotPass";
+
+    /**
+     * 话题关闭
+     */
+    String NOTICE_BUSINESS_TYPE_GROUP_TOPIC_CLOSED = "groupTopicClosed";
+
+    /**
+     * 话题转议题通过
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_PASSED = "topicToIssuePass";
+
+    /**
+     * 话题转议题不通过
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_NOT_PASSED = "topicToIssueNotPassed ";
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/TopicImageConstant.java

@@ -0,0 +1,16 @@
+package com.elink.esua.epdc.dto.constant;
+
+/**
+ *
+ * 图片类型
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/6 16:17
+ */
+public interface TopicImageConstant {
+
+    /**
+     * 图片类型-事件
+     */
+    String TYPE_IMAGE_BIZ_TOPIC = "topic";
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/TopicNoticeConstant.java

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.constant;
+
+/**
+ * 发送消息常量
+ * @Author LC
+ * @Date 2019/9/18 17:26
+ */
+public interface TopicNoticeConstant {
+    /**
+     * 话题被评论
+     */
+    String NOTICE_TOPIC_COMMENT = "你的话题【有新评论】";
+    /**
+     * 评论被回复
+     */
+    String NOTICE_TOPIC_COMMENT_REPLY = "你的评论【有新回复】";
+    /**
+     * 评论支持
+     */
+    String NOTICE_COMMENT_APPROVE = "你的评论【有新的支持】";
+    /**
+     * 评论反对
+     */
+    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的不支持】";
+
+
+
+    /**
+     * 我的消息类型：1互动通知
+     */
+    String NOTICE_TYPE_INTERACTIVE_NOTICE = "1";
+
+
+    /**
+     * 消息所属业务类型：话题评论
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT = "topicComment";
+    /**
+     * 消息所属业务类型：话题评论回复
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_REPLY = "topicCommentReply";
+
+    /**
+     * 消息所属业务类型：话题评论支持
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_APPROVE = "topicCommentApprove";
+
+    /**
+     * 消息所属业务类型：话题评论反对
+     */
+    String NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_OPPOSE = "topicCommentOppose";
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/enums/GroupStateEnum.java

@@ -0,0 +1,56 @@
+package com.elink.esua.epdc.dto.enums;
+
+/**
+ *
+ * 社群状态枚举
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/17 14:15
+ */
+public enum GroupStateEnum {
+
+    /**
+     * 0-待审核
+     */
+    GROUP_STATE_PENDING_REVIEW(0, "待审核"),
+    /**
+     * 5-审核不通过
+     */
+    GROUP_STATE_AUDIT_NOT_PASSED(5, "审核不通过"),
+    /**
+     * 10-审核通过
+     */
+    GROUP_STATE_EXAMINATION_PASSED(10, "审核通过"),
+    /**
+     * 15-禁言
+     */
+    GROUP_STATE_BANNED(15, "禁言"),
+    /**
+     * 20-已解散
+     */
+    GROUP_STATE_DISBANDED(20, "已解散");
+
+    private Integer value;
+    private String name;
+
+    GroupStateEnum(Integer value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/enums/GroupUserStateEnum.java

@@ -0,0 +1,56 @@
+package com.elink.esua.epdc.dto.enums;
+
+/**
+ *
+ * 社群成员状态枚举
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/17 15:38
+ */
+public enum GroupUserStateEnum {
+
+    /**
+     * 0-待审核
+     */
+    GROUP_USER_STATE_PENDING_REVIEW(0, "待审核"),
+    /**
+     * 5-审核不通过
+     */
+    GROUP_USER_STATE_AUDIT_NOT_PASSED(5, "审核不通过"),
+    /**
+     * 10-审核通过
+     */
+    GROUP_USER_STATE_EXAMINATION_PASSED(10, "审核通过"),
+    /**
+     * 15-已退群
+     */
+    GROUP_USER_STATE_RETIRED(15, "已退群"),
+    /**
+     * 20-已移除
+     */
+    GROUP_USER_STATE_REMOVED(20, "已移除");
+
+    private Integer value;
+    private String name;
+
+    GroupUserStateEnum(Integer value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/enums/TopicStateEnum.java

@@ -0,0 +1,56 @@
+package com.elink.esua.epdc.dto.enums;
+
+/**
+ *
+ * 话题状态枚举
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/6 15:11
+ */
+public enum TopicStateEnum {
+
+    /**
+     * 0-讨论中
+     */
+    TOPIC_STATE_IN_CONVERSATION(0, "讨论中"),
+    /**
+     * 5-转议题待审核
+     */
+    TOPIC_STATE_CHANGE_TO_ISSUE_PENDING_REVIEW(5, "转议题待审核"),
+    /**
+     * 10-已转议题
+     */
+    TOPIC_STATE_CHANGED_ISSUE(10, "已转议题"),
+    /**
+     * 15-已转项目
+     */
+    TOPIC_STATE_CHANGED_ITEM(15, "已转项目"),
+    /**
+     * 20-已关闭
+     */
+    TOPIC_STATE_CLOSED(20, "已关闭");
+
+    private Integer value;
+    private String name;
+
+    TopicStateEnum(Integer value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 事件评论DTO
+ * @Author LC
+ * @Date 2019/9/6 17:20
+ */
+@Data
+public class EpdcEventsCommentsDTO implements Serializable {
+    private static final long serialVersionUID = 2112619345374657409L;
+
+    /**
+     * 评论ID
+     */
+    private String commentId;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 用户是否赞过，false未赞
+     */
+    private boolean userLike;
+    /**
+     * 用户是否踩过，true踩
+     */
+    private boolean userDislike;
+    /**
+     * 评论时间
+     */
+    private Date commentTime;
+    /**
+     * 赞数
+     */
+    private Integer approveNum;
+    /**
+     * 踩数
+     */
+    private Integer opposeNum;
+    /**
+     * 表态次数
+     */
+    private Integer attitudeNum;
+    /**
+     * 用户信息
+     */
+    private UserBaseInfoDto user;
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+    private String shieldFlag;
+    /**
+     * 回复评论信息
+     */
+    private ReplyCommentDto replyComment;
+}

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

@@ -0,0 +1,73 @@
+/**
+ * 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.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 党群议事-议题管理-待审核列表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Data
+public class EpdcEventsDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件ID
+     */
+	private String id;
+	/**
+	 * 用户昵称
+	 */
+	private String nickName;
+	/**
+	 * 事件内容
+	 */
+	private String eventContent;
+	/**
+	 * 提交时间
+	 */
+	private Date createdTime;
+	/**
+	 * 父所有部门ID
+	 */
+	private String parentDeptIds;
+	/**
+	 * 父所有部门名称
+	 */
+	private String parentDeptNames;
+	/**
+	 * 所有部门ID
+	 */
+	private String allDeptIds;
+	/**
+	 * 所有部门名称
+	 */
+	private String allDeptNames;
+
+	/**
+	 * 分类全称
+	 */
+	private String categoryFullName;
+
+}

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

@@ -0,0 +1,82 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author LC
+ * @Date 2019/9/4 20:18
+ */
+@Data
+public class EpdcEventsDetailDTO implements Serializable {
+    private static final long serialVersionUID = 7859650300609726002L;
+
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 用户头像
+     */
+    private String userFace;
+
+    /**
+     * 党员标志
+     */
+    private String partyFlag;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+    /**
+     * 提交时间
+     */
+    private Date createdTime;
+    /**
+     * 图片
+     */
+    private List<String> imageArray;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 图片
+     */
+    private List<String> handleResidentImages;
+    /**
+     * 事件地址
+     */
+    private String advice;
+    /**
+     * 纬度
+     */
+    private Double issueLatitude;
+    /**
+     * 经度
+     */
+    private Double issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String allDeptNames;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
+}

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

@@ -0,0 +1,71 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 已关闭事件详情DTO
+ * @Author LC
+ * @Date 2019/9/6 14:40
+ */
+@Data
+public class EpdcRejectEventDetailDTO implements Serializable {
+    private static final long serialVersionUID = 1859147277434313829L;
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+    /**
+     * 提交人
+     */
+    private String nickName;
+    /**
+     * 提交时间
+     */
+    private Date createdTime;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 事件状态
+     */
+    private String stateName;
+    /**
+     * 驳回意见
+     */
+    private String advice;
+    /**
+     * 事件图片
+     */
+    private List<String> images;
+    /**
+     * 纬度
+     */
+    private Double issueLatitude;
+    /**
+     * 经度
+     */
+    private Double issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String allDeptNames;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
+}

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

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author LC
+ * @Date 2019/9/6 15:01
+ */
+@Data
+public class EpdcRejectEventsDTO implements Serializable {
+    private static final long serialVersionUID = 6690317385292584525L;
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 提交人
+     */
+    private String nickName;
+    /**
+     * 提交时间
+     */
+    private String createdTime;
+    /**
+     * 时间内容
+     */
+    private String eventContent;
+    /**
+     * 来源：话题名称或者‘党群议事’
+     */
+    private String groupName;
+}

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

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 事件分类信息
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/29 13:40
+ */
+@Data
+public class EventsCategoryDTO implements Serializable {
+    private static final long serialVersionUID = 6840230339149351580L;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 一级分类编码
+     */
+    private String firstCategoryCode;
+
+    /**
+     * 分类全称
+     */
+    private String categoryFullName;
+
+}

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

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 被回复的评论
+ * @Author LC
+ * @Date 2019/9/6 17:25
+ */
+@Data
+public class ReplyCommentDto implements Serializable {
+    private static final long serialVersionUID = 3501567846629315395L;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 内容
+     */
+    private String content;
+}

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

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户基础信息DTO
+ * @Author LC
+ * @Date 2019/9/6 17:23
+ */
+@Data
+public class UserBaseInfoDto implements Serializable {
+    private static final long serialVersionUID = -6564298463849924671L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 用户头像
+     */
+    private String userFace;
+
+    /**
+     * PARTY_FLAG 党员标识（0-否，1-是）
+     */
+    private String partyFlag;
+}

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

@@ -0,0 +1,160 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author LC
+ * @Date 2019/9/8 15:25
+ */
+@Data
+public class EpdcEventSubmitFormDTO implements Serializable {
+    private static final long serialVersionUID = -1869446375416414676L;
+
+    /**
+     * 事件内容
+     */
+    @NotBlank(message = "事件内容不能为空")
+    @Size(min = 1, max = 500, message = "事件内容不能为空且在500个字以内")
+    private String eventContent;
+    /**
+     * 事件地址
+     */
+    @NotBlank(message = "地址信息不能为空")
+    @Size(min = 1, max = 100, message = "地址信息不能为空且在100个字以内")
+    private String issueAddress;
+    /**
+     * 经度
+     */
+    @NotNull(message = "经度不能为空")
+    private Double issueLongitude;
+    /**
+     * 纬度
+     */
+    @NotNull(message = "纬度不能为空")
+    private Double issueLatitude;
+    /**
+     * 图片
+     */
+    private List<String> images;
+
+    /**
+     * 网格
+     */
+    private String grid;
+    /**
+     * 网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long gridId;
+    /**
+     * 父所有部门ID
+     */
+    @NotNull(message = "父所有部门ID不能为空")
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    @NotNull(message = "所有部门ID不能为空")
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户头像
+     */
+    private String userFace;
+
+    /**
+     * 党员标识 0：否、1：是
+     */
+    private String isPartyMember;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 社群ID
+     */
+    private String groupId;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 状态
+     */
+    private Integer eventState;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 一级分类编码
+     */
+    private String firstCategoryCode;
+
+    /**
+     * 分类全称
+     */
+    private String categoryFullName;
+
+    /**
+     * 处理意见
+     */
+    private String advice;
+
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+
+    /**
+     * 浏览数
+     */
+    private Integer browseNum;
+
+    /**
+     * 分类ID
+     */
+    private String categoryId;
+
+    /**
+     * 话题ID
+     */
+    private String topicId;
+
+    /**
+     * 转议题操作人信息
+     */
+    private Long changeUserId;
+    private String changeUsername;
+    private String changeUserMobile;
+}

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

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 审核事件提交表单DTO
+ * @Author LC
+ * @Date 2019/9/4 21:11
+ */
+@Data
+public class EpdcEventsReviewFormDTO implements Serializable {
+    private static final long serialVersionUID = 3950470078846120789L;
+
+    /**
+     * 事件ID
+     */
+    @NotBlank(message = "事件ID不能为空")
+    private String id;
+    /**
+     * 类别ID
+     */
+    private String categoryId;
+    /**
+     * 事件状态
+     */
+    @NotNull(message = "操作不能为空")
+    private Integer eventState;
+    /**
+     * 处理意见
+     */
+    @Size(min = 1, max = 500, message = "处理意见在500字以内")
+    private String advice;
+
+    private List<String> images;
+}

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

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ *  @author: qushutong
+ *  @Date: 2019/12/16 14:52
+ *  @Description: 查询参数
+ */
+@Data
+public class EventCountSqlFromDTO implements Serializable {
+    private static final long serialVersionUID = 4648104037156856679L;
+    /***
+     * 网格id
+     */
+    private Long gridId;
+
+    /***
+     *  月 季  年  0,1,2
+     */
+    private String type;
+
+    /***
+     * 0 是群众反应问题总数  1 群众反应问题响应数
+     */
+    private String responseType;
+
+}

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

@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author LC
+ * @Date 2019/9/8 15:25
+ */
+@Data
+public class EventDeleteCommentsFormDTO implements Serializable {
+    private static final long serialVersionUID = -1869446375416414676L;
+
+    private String[] commentIds;
+}

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

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/3/7 12:46
+ */
+@Data
+public class GroupFormDTO implements Serializable {
+    private static final long serialVersionUID = 5915096900970194933L;
+
+    /**
+     * 社群ID
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.events.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 待审核或审核不通过事件详情
+ * @Author LC
+ * @Date 2019/9/17 17:28
+ */
+@Data
+public class EventAppDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 1171586248033198322L;
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 事件内容
+     */
+    private String content;
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    /**
+     * 是否党员 0否；1是
+     */
+    private String partyFlag;
+    /**
+     * 发布时间
+     */
+    private String distributeTime;
+    /**
+     * 图片
+     */
+    private List<String> images;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 审核不通过意见
+     */
+    private String advice;
+}

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

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 社群排行榜-活跃度
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/12 16:05
+ */
+@Data
+public class GroupActivityDTO implements Serializable {
+    private static final long serialVersionUID = -3033977017133093569L;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 所属网格
+     */
+    private String allDeptNames;
+}

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

@@ -0,0 +1,157 @@
+/**
+ * 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.group;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 社群表 社群表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-10-10
+ */
+@Data
+public class GroupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 社群名称
+     */
+	private String groupName;
+
+    /**
+     * 社群头像
+     */
+	private String groupAvatar;
+
+    /**
+     * 社群介绍
+     */
+	private String groupIntroduction;
+
+    /**
+     * 社群类别 0：党员群，1：自建群
+     */
+	private String groupCategory;
+
+//    /**
+//     * 区
+//     */
+//	private String area;
+//
+//    /**
+//     * 区ID
+//     */
+//	private Long areaId;
+//
+//    /**
+//     * 街道
+//     */
+//	private String street;
+//
+//    /**
+//     * 街道ID
+//     */
+//	private Long streetId;
+//
+//    /**
+//     * 社区
+//     */
+//	private String community;
+//
+//    /**
+//     * 社区ID
+//     */
+//	private Long communityId;
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 网格
+     */
+	private String grid;
+
+    /**
+     * 网格ID
+     */
+	private Long gridId;
+
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
+     */
+	private Integer state;
+
+    /**
+     * 处理意见
+     */
+	private String processingOpinions;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,43 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 社群审核详情DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 10:24
+ */
+@Data
+public class GroupDetailDTO implements Serializable {
+    private static final long serialVersionUID = -7520759616474298301L;
+
+    /**
+     * 社群ID
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 社群介绍
+     */
+    private String groupIntroduction;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 群主
+     */
+    private String nickname;
+}

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

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2019/11/12 9:28
+ */
+@Data
+public class GroupListDTO implements Serializable {
+    private static final long serialVersionUID = 5340620329305821737L;
+
+    /**
+     * 社群ID
+     */
+    private String groupId;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+}

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

@@ -0,0 +1,51 @@
+package com.elink.esua.epdc.dto.group;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 社群管理DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/15 15:05
+ */
+@Data
+public class GroupManagementDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+
+    /**
+     * 社群类别 0：党员群，1：自建群
+     */
+    private String groupCategory;
+
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
+     */
+    private Integer state;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 群主
+     */
+    private String nickname;
+
+}

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

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2019/11/12 16:07
+ */
+@Data
+public class GroupMemberDTO implements Serializable {
+    private static final long serialVersionUID = 5630344874027207828L;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 群成员数量
+     */
+    private Integer memberNum;
+
+    /**
+     * 所属网格
+     */
+    private String allDeptNames;
+}

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

@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ *
+ * 禁言、解禁、解散社群DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 9:21
+ */
+@Data
+public class GroupSettingStateDTO implements Serializable {
+    private static final long serialVersionUID = -1288250589698851089L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群id不能为空")
+    private String id;
+
+    /**
+     * 状态 5：审核不通过，10：审核通过/解禁，15：禁言，20：解散
+     */
+    @NotNull(message = "社群状态不能为空")
+    private Integer state;
+
+    /**
+     * 处理意见
+     */
+    @Size(min = 0, max = 500, message = "处理意见在500字以内")
+    private String processingOpinions;
+
+    /**
+     * 操作用户ID
+     */
+    private String userId;
+
+}

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

@@ -0,0 +1,116 @@
+/**
+ * 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.group;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 用户社群关系表 用户社群关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-10-17
+ */
+@Data
+public class UserGroupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 社群ID
+     */
+	private String groupId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户名
+     */
+	private String nickname;
+
+    /**
+     * 用户头像
+     */
+	private String userAvatar;
+
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+
+    /**
+     * 群主标识 0：否，1：是
+     */
+	private String lordFlag;
+
+    /**
+     * 党员标识 0：否，1：是
+     */
+	private String partyMember;
+
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：已退群，20：已移除
+     */
+	private Integer state;
+
+    /**
+     * 审核意见
+     */
+	private String auditOpinion;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.group;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2019/11/6 13:18
+ */
+@Data
+public class UserReviewDto implements Serializable {
+    private static final long serialVersionUID = 5555206313726765102L;
+
+    private String id;
+
+    /**
+     * 审核结果（5：审核不通过，10：审核通过）
+     */
+    @NotNull(message = "审核结果不能为空")
+    private Integer state;
+
+    /**
+     * 审核意见
+     */
+    private String auditOpinion;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

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

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 添加成员Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/6 9:00
+ */
+@Data
+public class GroupAddUserFormDTO implements Serializable {
+    private static final long serialVersionUID = 7220929684754186126L;
+
+    /**
+     * 社群ID
+     */
+    private String groupId;
+
+    /**
+     * 添加成员信息
+     */
+    List<GroupUserFormDTO> members;
+}

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

@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * 申请入群Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/11 13:58
+ */
+@Data
+public class GroupApplyFormDTO implements Serializable {
+    private static final long serialVersionUID = -1708301010893268772L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String groupId;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户名
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String userAvatar;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 党员标识 0：否，1：是
+     */
+    private String partyMember;
+}

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

@@ -0,0 +1,89 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 批量生成党员群DTO
+ * @Author： yinzuomei
+ * @Date： 2019-12-19
+ */
+@Data
+public class GroupBatchCreateFormDTO implements Serializable {
+    private static final long serialVersionUID = 2948200217356354599L;
+
+    /**
+     * 社群名称
+     */
+    @NotBlank(message = "社群名称不能为空且在10个字以内")
+    @Size(min = 1, max = 10, message = "社群名称不能为空且在10个字以内")
+    private String groupName;
+
+    /**
+     * 社群头像
+     */
+    @NotBlank(message = "社群头像不能为空")
+    private String groupAvatar;
+
+    /**
+     * 社群介绍
+     */
+    @NotBlank(message = "社群介绍不能为空且在500个字以内")
+    @Size(min = 1, max = 500, message = "社群介绍不能为空且在500个字以内")
+    private String groupIntroduction;
+
+    /**
+     * 社群类别 0：党员群，1：自建群
+     */
+    private String groupCategory;
+
+
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long gridId;
+
+    /**
+     * 父所有部门ID
+     */
+    @NotNull(message = "父所有部门ID不能为空")
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    @NotNull(message = "所有部门ID不能为空")
+    private String allDeptIds;
+
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 社群状态
+     */
+    private Integer state;
+
+    /**
+     *  用户信息
+     */
+    private List<GroupUserFormDTO> groupUserFormDTOList;
+}

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

@@ -0,0 +1,99 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ *
+ * 创建社群DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/17 13:52
+ */
+@Data
+public class GroupCreateFormDTO implements Serializable {
+    private static final long serialVersionUID = 2948200217356354599L;
+
+    /**
+     * 社群名称
+     */
+    @NotBlank(message = "社群名称不能为空且在10个字以内")
+    @Size(min = 1, max = 10, message = "社群名称不能为空且在10个字以内")
+    private String groupName;
+    /**
+     * 社群头像
+     */
+    @NotBlank(message = "社群头像不能为空")
+    private String groupAvatar;
+    /**
+     * 社群介绍
+     */
+    @NotBlank(message = "社群介绍不能为空且在500个字以内")
+    @Size(min = 1, max = 500, message = "社群介绍不能为空且在500个字以内")
+    private String groupIntroduction;
+    /**
+     * 社群类别 0：党员群，1：自建群
+     */
+    private String groupCategory;
+
+//    /**
+//     * 街道
+//     */
+//    private String street;
+//    /**
+//     * 街道ID
+//     */
+//    @NotNull(message = "用户街道ID不能为空")
+//    private Long streetId;
+//    /**
+//     * 社区
+//     */
+//    private String community;
+//    /**
+//     * 社区ID
+//     */
+//    @NotNull(message = "用户社区ID不能为空")
+//    private Long communityId;
+    /**
+     * 网格
+     */
+    private String grid;
+    /**
+     * 网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long gridId;
+
+    /**
+     * 父所有部门ID
+     */
+    @NotNull(message = "父所有部门ID不能为空")
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    @NotNull(message = "所有部门ID不能为空")
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 社群状态
+     */
+    private Integer state;
+
+    /**
+     * 群主信息
+     */
+    private GroupUserFormDTO groupUserFormDTO;
+}

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

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * 移动端-社群详情Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/22 14:59
+ */
+@Data
+public class GroupDetailForMobileEndFormDTO implements Serializable {
+    private static final long serialVersionUID = 143504049551089465L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+}

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

@@ -0,0 +1,38 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ *
+ * 修改群介绍Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/22 15:28
+ */
+@Data
+public class GroupIntroductionFormDTO implements Serializable {
+    private static final long serialVersionUID = -9116266878310792465L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String id;
+
+    /**
+     * 社群介绍
+     */
+    @NotBlank(message = "社群介绍不能为空且在500个字以内")
+    @Size(min = 1, max = 500, message = "社群介绍不能为空且在500个字以内")
+    private String groupIntroduction;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+}

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

@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * 修改群头像Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/22 17:15
+ */
+@Data
+public class GroupModifyAvatarFormDTO implements Serializable {
+    private static final long serialVersionUID = -1068809568439910879L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String id;
+
+    /**
+     * 社群头像
+     */
+    @NotBlank(message = "社群头像不能为空")
+    private String groupAvatar;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+}

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

@@ -0,0 +1,60 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * 社群成员DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/17 14:27
+ */
+@Data
+public class GroupUserFormDTO implements Serializable {
+    private static final long serialVersionUID = -1532468675717622698L;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+    /**
+     * 用户昵称
+     */
+    @NotBlank(message = "用户昵称不能为空")
+    private String nickname;
+    /**
+     * 用户头像
+     */
+    @NotBlank(message = "用户头像不能为空")
+    private String userAvatar;
+    /**
+     * 用户手机号
+     */
+    @NotBlank(message = "用户联系方式不能为空")
+    private String mobile;
+    /**
+     * 群主标识 0：否，1：是
+     */
+    private String lordFlag;
+    /**
+     * 党员标识 0：否，1：是
+     */
+    private String partyMember;
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：已退群，20：已移除
+     */
+    private Integer state;
+    /**
+     * 处理意见
+     */
+    private String auditOpinion;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+}

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

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2019/11/11 14:24
+ */
+@Data
+public class GroupUserPartyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = 6172069865037633276L;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+    /**
+     * 用户昵称
+     */
+    @NotBlank(message = "用户昵称不能为空")
+    private String nickname;
+    /**
+     * 用户头像
+     */
+    @NotBlank(message = "用户头像不能为空")
+    private String userAvatar;
+    /**
+     * 用户手机号
+     */
+    private String mobile;
+    /**
+     * 群主标识 0：否，1：是
+     */
+    private String lordFlag;
+    /**
+     * 党员标识 0：否，1：是
+     */
+    private String partyMember;
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：已退群，20：已移除
+     */
+    private Integer state;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+}

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

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * 删除社群成员或退出社群Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/23 10:04
+ */
+@Data
+public class GroupUserRemoveOrQuitFormDTO implements Serializable {
+    private static final long serialVersionUID = -4095328797214022209L;
+
+    /**
+     * 操作人ID
+     */
+    private String operatorId;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String groupId;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+}

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

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import com.elink.esua.epdc.dto.group.UserReviewDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 入群审核Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/6 11:07
+ */
+@Data
+public class GroupUserReviewFormDTO implements Serializable {
+    private static final long serialVersionUID = 490810653280939342L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String groupId;
+
+    /**
+     * 审核用户
+     */
+    private List<UserReviewDto> members;
+}

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

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ *
+ * 社群成员Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/23 9:10
+ */
+@Data
+public class GroupUsersFormDTO implements Serializable {
+    private static final long serialVersionUID = 7099778185347825038L;
+
+    /**
+     * 社群ID
+     */
+    @NotBlank(message = "社群ID不能为空")
+    private String groupId;
+
+    /**
+     * 状态 0：待审核，10：审核通过
+     */
+    @NotNull(message = "成员状态不能为空")
+    private Integer state;
+}

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

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ *
+ * 我的群FormDTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 17:06
+ */
+@Data
+public class GroupsOfMineFormDTO implements Serializable {
+    private static final long serialVersionUID = 6427160357602633892L;
+
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+    /**
+     * 网格ID
+     */
+    @NotNull(message = "网格ID不能为空")
+    private Long gridId;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java

@@ -0,0 +1,67 @@
+package com.elink.esua.epdc.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 移动端-社群详情Result DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/22 14:53
+ */
+@Data
+public class GroupDetailForMobileEndResultDTO implements Serializable {
+    private static final long serialVersionUID = -9095533656720281885L;
+
+    /**
+     * 社群ID
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 社群头像
+     */
+    private String groupAvatar;
+
+    /**
+     * 社群介绍
+     */
+    private String groupIntroduction;
+
+    /**
+     * 群主
+     */
+    private String nickname;
+
+    /**
+     * 总人数
+     */
+    private Integer totalNum;
+
+    /**
+     * 话题数量
+     */
+    private Integer topicNum;
+
+    /**
+     * 转到党群议事话题数量
+     */
+    private Integer changeToIssueNum;
+
+    /**
+     * 社群类别（0：党员群，1：自建群）
+     */
+    private String groupCategory;
+
+    /**
+     * 当前用户是否是群主（0：否，1：是）
+     */
+    private String lordFlag;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/result/GroupUserListResultDTO.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 社群成员列表DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 11:06
+ */
+@Data
+public class GroupUserListResultDTO implements Serializable {
+    private static final long serialVersionUID = -3650254690194925656L;
+
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户名
+     */
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    private String userAvatar;
+
+    /**
+     * 群主标识 0：否，1：是
+     */
+    private String lordFlag;
+
+    /**
+     * 申请时间
+     */
+    private Date createdTime;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/result/GroupsOfMineResultDTO.java

@@ -0,0 +1,68 @@
+package com.elink.esua.epdc.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 我的群列表DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/21 17:00
+ */
+@Data
+public class GroupsOfMineResultDTO implements Serializable {
+    private static final long serialVersionUID = 346523775154631726L;
+
+    /**
+     * 社群ID
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 社群头像
+     */
+    private String groupAvatar;
+
+    /**
+     * 总人数
+     */
+    private Integer totalNum;
+
+    /**
+     * 党员人数
+     */
+    private Integer partyMemberNum;
+
+    /**
+     * 未读话题数量
+     */
+    private Integer unreadTopicNum;
+
+    /**
+     * 最新一条话题发布时间（yyyy-MM-dd HH:mm）
+     */
+    private Date latestTopicTime;
+
+    /**
+     * 社群类别（0：党员群，1：自建群）
+     */
+    private String groupCategory;
+
+    /**
+     * 社群状态（0：待审核，5：审核不通过，10：审核通过，15：禁言）
+     */
+    private Integer state;
+
+    /**
+     * 群名称下方的描述
+     */
+    private String description;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/result/GroupsOfRecommendResultDTO.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 推荐群DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/10/22 11:18
+ */
+@Data
+public class GroupsOfRecommendResultDTO implements Serializable {
+    private static final long serialVersionUID = 9117108366107815457L;
+
+    /**
+     * 社群ID
+     */
+    private String id;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 社群头像
+     */
+    private String groupAvatar;
+
+    /**
+     * 总人数
+     */
+    private String totalNum;
+
+    /**
+     * 党员人数
+     */
+    private String partyMemberNum;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/result/TopicAuditRecordResultDTO.java

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 话题审核记录Result DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/8 9:25
+ */
+@Data
+public class TopicAuditRecordResultDTO implements Serializable {
+    private static final long serialVersionUID = 8330963966208262163L;
+
+    /**
+     * 状态（0：审核不通过，2：已关闭）
+     */
+    private Integer state;
+
+    /**
+     * 处理意见
+     */
+    private String processingOpinions;
+
+    /**
+     * 审核时间
+     */
+    private Date createdTime;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/interfacelog/InterfaceLogDTO.java

@@ -0,0 +1,96 @@
+/**
+ * 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.interfacelog;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 接口日志表 接口日志表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-14
+ */
+@Data
+public class InterfaceLogDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 引用ID
+     */
+    private String referenceId;
+
+    /**
+     * 业务类型
+     */
+    private String businessType;
+
+    /**
+     * 调用接口名称
+     */
+    private String interfaceName;
+
+    /**
+     * 调用是否成功 0-调用失败，1-调用成功
+     */
+    private String successFlag;
+
+    /**
+     * 调用消息体
+     */
+    private String callMsgBody;
+
+    /**
+     * 调用返回消息体
+     */
+    private String returnMsgBody;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/EventUserAttitudeDTO.java

@@ -0,0 +1,86 @@
+/**
+ * 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.issue;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 事件点赞点踩表 事件点赞点踩表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-09-09
+ */
+@Data
+public class EventUserAttitudeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 事件ID
+     */
+	private String eventId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户点赞点踩标识 0：点赞，1：踩
+     */
+	private String attitudeFlag;
+
+    /**
+     * 删除标识 0：未删除，1：删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java

@@ -0,0 +1,100 @@
+package com.elink.esua.epdc.dto.issue;
+
+import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 议题内容DTO
+ * @Author LC
+ * @Date 2019/9/6 15:58
+ */
+@Data
+public class IssueContentDetailDTO implements Serializable {
+    private static final long serialVersionUID = 8931053684837605978L;
+    /**
+     * 发布人
+     */
+    private String nickName;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+    /**
+     * 用户头像
+     */
+    private String userFace;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 支持数
+     */
+    private Integer approveNum;
+    /**
+     * 反对数
+     */
+    private Integer opposeNum;
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+
+    /**
+     * 评论数
+     */
+    private Integer participantsNum;
+    /**
+     * 图片
+     */
+    private List<String> images;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 纬度
+     */
+    private Double issueLatitude;
+    /**
+     * 经度
+     */
+    private Double issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String allDeptNames;
+    /**
+     * 所属类别
+     */
+    private String categoryName;
+
+    /**
+     * 议题处理进度
+     */
+    List<IssueProgressResultDTO> issueProgressResultDTOS;
+
+    /**
+     * 项目处理进度
+     */
+    List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java

@@ -0,0 +1,208 @@
+/**
+ * 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.issue;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 议题表 议题表
+ *
+ * @author yujintao yujintao@elink-cn.com
+ * @since v1.0.0 2019-09-05
+ */
+@Data
+public class IssueDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 事件ID
+     */
+	private String eventId;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 用户昵称
+     */
+	private String nickName;
+
+    /**
+     * 用户头像
+     */
+	private String userFace;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 议题内容
+     */
+	private String issueContent;
+
+    /**
+     * 区
+     */
+	private String area;
+
+    /**
+     * 区ID
+     */
+	private Long areaId;
+
+    /**
+     * 街道
+     */
+	private String street;
+
+    /**
+     * 街道ID
+     */
+	private Long streetId;
+
+    /**
+     * 社区
+     */
+	private String community;
+
+    /**
+     * 社区ID
+     */
+	private Long communityId;
+
+    /**
+     * 网格
+     */
+	private String grid;
+
+    /**
+     * 网格ID
+     */
+	private Long gridId;
+
+    /**
+     * 议题位置地址
+     */
+	private String issueAddress;
+
+    /**
+     * 议题分类ID
+     */
+	private String issueCategoryId;
+
+    /**
+     * 议题位置纬度
+     */
+	private Double issueLatitude;
+
+    /**
+     * 议题位置经度
+     */
+	private Double issueLongitude;
+
+    /**
+     * 议题状态 0-审核通过，2-已关闭，4-已转项目
+     */
+	private Integer issueState;
+
+    /**
+     * 删除标识 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 社群ID
+     */
+    private String groupId;
+
+    /**
+     * 社群名称
+     */
+    private String groupName;
+
+    /**
+     * 话题ID
+     */
+    private String topicId;
+
+	/**
+	 * 议题编号
+	 */
+	private String issueCode;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门名称
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
+
+    /**
+     * 分类全称
+     */
+    private String categoryFullName;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueJobFeedbackDTO.java

@@ -0,0 +1,38 @@
+package com.elink.esua.epdc.dto.issue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 议题待处理工作反馈DTO
+ * @Author LC
+ * @Date 2019/9/6 10:42
+ */
+@Data
+public class IssueJobFeedbackDTO implements Serializable {
+    private static final long serialVersionUID = 8884285160297991105L;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+    /**
+     * 状态名称
+     */
+    private String stateName;
+    /**
+     * 时间
+     */
+    private Date createdTime;
+    /**
+     * 意见
+     */
+    private String advice;
+
+    /**
+     * 处理部门
+     */
+    private String handlerDept;
+}

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

@@ -0,0 +1,72 @@
+package com.elink.esua.epdc.dto.issue;
+
+import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 议题待处理详情DTO
+ * @Author LC
+ * @Date 2019/9/6 10:36
+ */
+@Data
+public class IssueWaitHandleDetailDTO implements Serializable {
+    private static final long serialVersionUID = -8149882405346393016L;
+
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 发布人
+     */
+    private String nickName;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 图片
+     */
+    private List<String> images;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 纬度
+     */
+    private Double issueLatitude;
+    /**
+     * 经度
+     */
+    private Double issueLongitude;
+    /**
+     * 所属网格详细信息
+     */
+    private String allDeptNames;
+    /**
+     * 类别
+     */
+    private String categoryName;
+    /**
+     * 议题处理进度
+     */
+    List<IssueProgressResultDTO> issueProgressResultDTOS;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java

@@ -0,0 +1,70 @@
+package com.elink.esua.epdc.dto.issue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 议题待处理、已关闭、已转项目列表DTO
+ * @Author LC
+ * @Date 2019/9/5 14:19
+ */
+@Data
+public class IssueWaitHandleOrClosedDTO implements Serializable {
+    private static final long serialVersionUID = -9108628659586683187L;
+
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 提交时间
+     */
+    private Date createdTime;
+    /**
+     * 提交人
+     */
+    private String nickName;
+    /**
+     * 参与人数
+     */
+    private Integer participateNum;
+
+    private Integer participantsNum;
+    /**
+     * 支持人数
+     */
+    private Integer approveNum;
+    /**
+     * 反对人数
+     */
+    private Integer opposeNum;
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+    /**
+     * 浏览数
+     */
+    private Integer browseNum;
+
+    /**
+     * 议题编号
+     */
+    private String issueCode;
+
+    /**
+     * 来源：话题名称或者‘党群议事’
+     */
+    private String groupName;
+
+    /**
+     * 项目状态 0-处理中，5-已关闭，10-已结案
+     */
+    private String itemState;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 议题分类统计表单DTO
+ * @Author LC
+ * @Date 2019/9/9 12:28
+ */
+@Data
+public class IssueCategoryStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = -6382725012003300283L;
+    /**
+     * 网格ID
+     */
+    @NotNull(message = "网格ID不能为空")
+    private Long gridId;
+    /**
+     * 议题类别ID
+     */
+    @NotBlank(message = "议题类别ID不能为空")
+    private String firstCategoryCode;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueDetailFormDTO.java

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 议题详情DTO
+ * @Author LC
+ * @Date 2019/9/9 11:11
+ */
+@Data
+public class IssueDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = -3193376894926069344L;
+    /**
+     * 议题ID
+     */
+    @NotBlank(message = "议题ID不能为空")
+    private String issueId;
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java

@@ -0,0 +1,61 @@
+package com.elink.esua.epdc.dto.issue.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.Date;
+
+/**
+ * 移动端-议题最新最热列表-查询条件
+ * @Author LC
+ * @Date 2019/9/7 10:45
+ */
+@Data
+public class IssueFormDTO implements Serializable {
+    private static final long serialVersionUID = -8864248267071206774L;
+
+    /**
+     * 用户所属网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long deptId;
+    /**
+     * 0: 获取最新列表，1: 获取最热列表
+     */
+    private String orderType;
+    /**
+     * 搜索内容
+     */
+    private String searchContent;
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private int pageIndex;
+    /**
+     * 页容量，默认20页
+     */
+    @Min(value = 1, message = "每页条数必须大于必须大于0")
+    private int pageSize = 20;
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+    /**
+     * 只查询半年内的数据
+     */
+    private Date someMonthsAgo;
+    /**
+     * 议题一级分类ID
+     */
+    private String firstCategoryCode;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuePendingResponseFormDTO.java

@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 事件列表接口（待回应/已驳回）
+ */
+@Data
+public class IssuePendingResponseFormDTO implements Serializable {
+
+    /**
+     *事件状态 0-待回应，2-已驳回
+     */
+    private Integer state;
+
+    /**
+     *部门ID
+     */
+    private Long deptId;
+
+    /**
+     *
+     */
+    private List deptIdList;
+
+    /**
+     *页码
+     */
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    private Integer pageSize;
+
+    /**
+     *第一页查询发起时的时间
+     */
+    private String timestamp;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStateStatisticsFormDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 议题数据统计
+ */
+@Data
+public class IssueStateStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = -8864248267071206774L;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+}

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

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 议题待处理提交DTO
+ * @Author LC
+ * @Date 2019/9/6 11:14
+ */
+@Data
+public class IssueWaitHandleSubmitFormDTO implements Serializable {
+    private static final long serialVersionUID = 6440846393548873868L;
+
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 处理意见
+     */
+    @Size(min = 1, max = 500, message = "处理意见在500字以内")
+    private String advice;
+    /**
+     * 状态 1 添加处理意见，2 关闭，4 转项目
+     */
+    @NotNull(message = "处理操作不能为空")
+    private Integer state;
+
+    /**
+     * 图片
+     */
+    private List<String> images;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssuesAndEventsOfMineFormDTO.java

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 我的议题和事件
+ * @Author LC
+ * @Date 2019/9/17 16:06
+ */
+@Data
+public class IssuesAndEventsOfMineFormDTO implements Serializable {
+    private static final long serialVersionUID = -2940169066211304781L;
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/StatementFormDTO.java

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 表态议题（赞/踩）
+ *
+ */
+@Data
+public class StatementFormDTO {
+
+
+    /**
+     * 表态 0赞；1踩；2取消赞；3取消踩
+     */
+    @NotBlank(message = "表态值不能为空")
+    private String attitude;
+
+    private String issueId;
+
+    private String itemId;
+
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+    private String userName;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkEventCommentListFormDTO.java

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.issue.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.Date;
+import java.util.List;
+
+@Data
+public class WorkEventCommentListFormDTO implements Serializable {
+    private static final long serialVersionUID = -8864248267071206774L;
+
+    /**
+     * 事件ID
+     */
+    private String eventId;
+
+    /**
+     * 0: 获取最新列表，1: 获取最热列表
+     */
+    private String orderType;
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private int pageIndex;
+    /**
+     * 页容量，默认20页
+     */
+    @Min(value = 1, message = "每页条数必须大于必须大于0")
+    private int pageSize = 20;
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkIssueListFormDTO.java

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.issue.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.Date;
+import java.util.List;
+
+@Data
+public class WorkIssueListFormDTO implements Serializable {
+    private static final long serialVersionUID = -8864248267071206774L;
+
+    /**
+     * 用户所属网格ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户所属网格ID列表
+     */
+    private List<Long> deptIdList;
+
+    /**
+     * 0: 获取最新列表，1: 获取最热列表
+     */
+    private String orderType;
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private int pageIndex;
+    /**
+     * 页容量，默认20页
+     */
+    @Min(value = 1, message = "每页条数必须大于必须大于0")
+    private int pageSize = 20;
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+    /**
+     * 议题状态 0-待处理，2-已关闭
+     */
+    private Integer issueState;
+
+
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/form/WorkProcessListFormDTO.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.issue.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 议题详情DTO
+ * @Author LC
+ * @Date 2019/9/9 11:11
+ */
+@Data
+public class WorkProcessListFormDTO implements Serializable {
+    private static final long serialVersionUID = -3193376894926069344L;
+    /**
+     * 议题ID
+     */
+    @NotBlank(message = "议题ID不能为空")
+    private String issueId;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 议题分类统计DTO
+ * @Author LC
+ * @Date 2019/9/9 12:22
+ */
+@Data
+public class IssueCategoryStatisticsResultDTO implements Serializable {
+    private static final long serialVersionUID = 4793536739383889544L;
+
+    /**
+     * 类别ID
+     */
+    private String categoryCode;
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+    /**
+     * 议题个数
+     */
+    private String issueNum;
+    /**
+     * 态度总数
+     */
+    private String attitudeNum;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java

@@ -0,0 +1,87 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 移动端-议题详情DTO
+ * @Author LC
+ * @Date 2019/9/9 9:50
+ */
+@Data
+public class IssueDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -4512771534907006929L;
+
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 事件ID
+     */
+    private String eventId;
+    /**
+     * 议题内容
+     */
+    private String content;
+    /**
+     * 创建时间
+     */
+    private Date distributeTime;
+    /**
+     * 是否党员 0否；1是
+     */
+    private Integer partyFlag;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    /**
+     * 议题地址
+     */
+    private String address;
+    /**
+     * 浏览量
+     */
+    private Integer browseNum;
+    /**
+     * 赞数
+     */
+    private Integer approveNum;
+    /**
+     * 踩数
+     */
+    private Integer opposeNum;
+    /**
+     * 所属类别ID
+     */
+    private String categoryCode;
+    /**
+     * 用户是否赞过，false未赞
+     */
+    private boolean userLike;
+    /**
+     * 用户是否踩过，true踩
+     */
+    private boolean userDislike;
+    /**
+     * 是否可操作 true 可评论、回复、表态议题、表态评论
+     */
+    private boolean isOperational;
+    /**
+     * 议事图片
+     */
+    private List<String> images;
+
+    /**
+     * 一级分类编码
+     */
+    private String firstCategoryCode;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 议题处理进度DTO
+ * @Author LC
+ * @Date 2019/9/9 13:11
+ */
+@Data
+public class IssueHandleProgressResultDTO implements Serializable {
+    private static final long serialVersionUID = 2179111743827985376L;
+
+    /**
+     * 处理状态
+     */
+    private String stateName;
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+    /**
+     * 处理描述
+     */
+    private String advice;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHotCommentResultDTO.java

@@ -0,0 +1,38 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 移动端-议题列表最热评论
+ * @Author LC
+ * @Date 2019/9/7 11:07
+ */
+@Data
+public class IssueHotCommentResultDTO implements Serializable {
+    private static final long serialVersionUID = 4956688227865722755L;
+    /**
+     * 评论id
+     */
+    private String commentId;
+    /**
+     * 评论内容
+     */
+    private String content;
+    /**
+     * 评论支持数
+     */
+    private Integer supportNum;
+    /**
+     * 评论反对数
+     */
+    private Integer oppositionNum;
+
+    /**
+     * 评论时间
+     */
+    private Date createdTime;
+
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuePendingResponseResultDTO.java

@@ -0,0 +1,45 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 事件列表接口（待回应/已驳回）
+ */
+@Data
+public class IssuePendingResponseResultDTO implements Serializable {
+
+    /**
+     * 事件ID
+     */
+    private String id;
+
+    /**
+     *用户昵称
+     */
+    private String nickName;
+
+    /**
+     *事件内容
+     */
+    private String eventContent;
+
+    /**
+     *提交时间
+     */
+    private Date createdTime;
+
+    /**
+     *党员标识 0否；1是
+     */
+    private String partyFlag;
+
+    /**
+     *用户头像
+     */
+    private String userFace;
+}
+
+

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java

@@ -0,0 +1,55 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 议题处理进度（后台和工作端用）
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/21 15:08
+ */
+@Data
+public class IssueProgressResultDTO implements Serializable {
+    private static final long serialVersionUID = 2739821096656995025L;
+
+    /**
+     * 处理进度ID
+     */
+    private String id;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+    /**
+     * 时间
+     */
+    private String createdTime;
+    /**
+     * 意见
+     */
+    private String advice;
+    /**
+     * 操作人部门
+     */
+    private String handlerDept;
+
+    /**
+     * 处理图片
+     */
+    private List<String> images;
+
+    /**
+     * 操作人电话
+     */
+    private String mobile;
+
+    /**
+     * 来源社群
+     */
+    private String groupName;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueResultDTO.java

@@ -0,0 +1,81 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 移动端-议题最新最热列表
+ * @Author LC
+ * @Date 2019/9/7 10:53
+ */
+@Data
+public class IssueResultDTO implements Serializable {
+    private static final long serialVersionUID = 6087794316919494277L;
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 事件ID
+     */
+    private String eventId;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    /**
+     * 是否党员 0否；1是
+     */
+    private String partyFlag;
+    /**
+     * 赞数
+     */
+    private Integer approveNum;
+    /**
+     * 踩数
+     */
+    private Integer opposeNum;
+    /**
+     * 评数
+     */
+    private Integer commentNum;
+    /**
+     * 议题状态
+     */
+    private String stateName;
+    /**
+     * 议题类别
+     */
+    private String categoryName;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 表态数
+     */
+    private Integer statementNum;
+    /**
+     * 图片列表
+     */
+    private List<String> images;
+    /**
+     * 议题位置地址
+     */
+    private String address;
+    /**
+     * 最热的一条评论
+     */
+    private IssueHotCommentResultDTO comment;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStateStatisticsResultDTO.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *议题数据统计
+ */
+@Data
+public class IssueStateStatisticsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4512771534907006929L;
+
+    /**
+     *待回应数量
+     */
+    private Integer pendingResponseNum;
+
+    /**
+     *待处理数量
+     */
+    private Integer pendingHandleNum;
+
+    /**
+     *已驳回数量
+     */
+    private Integer rejectedNum;
+
+    /**
+     *已关闭数量
+     */
+    private Integer closed;
+}
+

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssuesAndEventsOfMineResultDTO.java

@@ -0,0 +1,50 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 我的议题和事件
+ * @Author LC
+ * @Date 2019/9/17 16:01
+ */
+@Data
+public class IssuesAndEventsOfMineResultDTO implements Serializable {
+    private static final long serialVersionUID = 856355753696906670L;
+
+    /**
+     * 议题或事件ID
+     */
+    private String id;
+    /**
+     * 事件ID
+     */
+    private String eventId;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 状态名称
+     */
+    private String stateName;
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+    /**
+     * 图片
+     */
+    private List<String> images;
+    /**
+     * 最热的一条评论
+     */
+    private IssueHotCommentResultDTO comment;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkEventCommentResultDTO.java

@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工作端-事件评论列表
+ * @Author wjp
+ */
+@Data
+public class WorkEventCommentResultDTO implements Serializable {
+    private static final long serialVersionUID = 4956688227865722755L;
+    /**
+     * 评论id
+     */
+    private String id;
+    /**
+     * 评论人昵称
+     */
+    private String userName;
+    /**
+     * 评论人头像
+     */
+    private String userFace;
+    /**
+     * 评论时间
+     */
+    private Date createdTime;
+    /**
+     * 评论内容
+     */
+    private String content;
+    /**
+     * 点赞数
+     */
+    private Integer likeCount;
+    /**
+     * 点踩数
+     */
+    private Integer unLikeCount;
+    /**
+     * 被回复数
+     */
+    private Integer replyCount;
+
+
+}

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

@@ -0,0 +1,78 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工作端-议题详情DTO
+ * @Author LC
+ * @Date 2019/9/9 9:50
+ */
+@Data
+public class WorkIssueDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -4512771534907006929L;
+
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 事件ID
+     */
+    private String eventId;
+    /**
+     * 议题内容
+     */
+    private String content;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 创建时间
+     */
+    private Date distributeTime;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    /**
+     * 议题地址
+     */
+    private String address;
+    /**
+     * 浏览量
+     */
+    private Integer browseNum;
+    /**
+     * 赞数
+     */
+    private Integer approveNum;
+    /**
+     * 踩数
+     */
+    private Integer opposeNum;
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+    /**
+     * 表态数
+     */
+    private Integer statementNum;
+    /**
+     * 议事图片
+     */
+    private List<String> images;
+}

epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueListResultDTO.java

@@ -0,0 +1,57 @@
+package com.elink.esua.epdc.dto.issue.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 移动端-议题最新最热列表
+ * @Author LC
+ * @Date 2019/9/7 10:53
+ */
+@Data
+public class WorkIssueListResultDTO implements Serializable {
+    private static final long serialVersionUID = 6087794316919494277L;
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 事件ID
+     */
+    private String eventId;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    private String userFace;
+    /**
+     * 是否党员 0否；1是
+     */
+    private String partyFlag;
+    /**
+     * 议题类别
+     */
+    private String categoryName;
+    /**
+     * 发布时间
+     */
+    private Date distributeTime;
+    /**
+     * 表态数
+     */
+    private Integer statementNum;
+    /**
+     * 最热的一条评论
+     */
+    private IssueHotCommentResultDTO comment;
+}