Merge remote-tracking branch 'origin/master'

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppGridManFormDTO.java

@@ -1,32 +0,0 @@
-package com.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * create by: zhangfenghe
- * description: 网格员列表请求接口对象
- * create time: 2021/8/28$ 18:11$
- */
-@Data
-public class EpdcAppGridManFormDTO implements Serializable {
-
-    private static final long serialVersionUID = 682964925596811152L;
-
-    /**
-     *页码
-     */
-    private int pageIndex;
-
-    /**
-     *页容量
-     */
-    private int pageSize;
-
-    /**
-     *所属网格id
-     */
-    private Long deptId;
-
-}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppShowIdentityFormDTO.java

@@ -1,41 +0,0 @@
-package com.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * create by: zhangfenghe
- * description: 党员亮身份信息入库请求参数
- * create time: 2021/8/28$ 19:10$
- */
-@Data
-public class EpdcAppShowIdentityFormDTO implements Serializable {
-
-    private static final long serialVersionUID = -5593165602745999938L;
-
-    /**
-     *用户ID
-     */
-    private Long userId;
-
-    /**
-     *头像地址
-     */
-    private String headUrl;
-
-    /**
-     *格言
-     */
-    private String motto;
-
-    /**
-     *承诺
-     */
-    private String promise;
-
-    /**
-     *服务范围
-     */
-    private String serviceArea;
-}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppGridManListResultDTO.java

@@ -1,36 +0,0 @@
-package com.elink.esua.epdc.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * create by: zhangfenghe
- * description: 网格员列表返回对象
- * create time: 2021/8/28$ $
- */
-@Data
-public class EpdcAppGridManListResultDTO implements Serializable {
-    private static final long serialVersionUID = -2712265120736911585L;
-
-
-    /**
-     *姓名
-     */
-    private String realName;
-
-    /**
-     *头像
-     */
-    private String headHrl;
-
-    /**
-     *箴言
-     */
-    private String proverbs;
-
-    /**
-     *电话
-     */
-    private String mobile;
-}

epdc-cloud-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppIdentityDetailResultDTO.java

@@ -1,35 +0,0 @@
-package com.elink.esua.epdc.dto.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * create by: zhangfenghe
- * description: 党员亮身份信息详情返回对象
- * create time: 2021/8/28$ 19:52$
- */
-@Data
-public class EpdcAppIdentityDetailResultDTO implements Serializable {
-    private static final long serialVersionUID = 3740385980880312741L;
-
-    /**
-     *格言
-     */
-    private String motto;
-
-    /**
-     *承诺
-     */
-    private String promise;
-
-    /**
-     *服务范围
-     */
-    private String serviceArea;
-
-    /**
-     *头像
-     */
-    private String headUrl;
-}

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/PopulationInformationDTO.java

@@ -113,6 +113,11 @@ public class PopulationInformationDTO implements Serializable {
      */
     private String militaryService;
 
+    /**
+     * 特殊人群
+     */
+    private String specialCrowd;
+
     /**
      * 户籍地
      */
@@ -294,6 +299,6 @@ public class PopulationInformationDTO implements Serializable {
     /**
      * 接种状态 0未接种 1接种中 2接种完成
      */
-    private String vaccinationState;
+    private Integer vaccinationState;
 
 }

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/AppVolunteerApplyDTO.java

@@ -52,7 +52,7 @@ public class AppVolunteerApplyDTO implements Serializable {
     /**
      * 网格ID
      */
-    private Long deptId;
+    private String deptId;
 
     /**
      * 父所有部门ID
@@ -84,7 +84,7 @@ public class AppVolunteerApplyDTO implements Serializable {
     /**
      * 党员标识
      */
-    private Integer partyFlag;
+    private String partyFlag;
 
 
 

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactInfoDTO.java

@@ -0,0 +1,176 @@
+/**
+ * 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.volunteer;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 志愿活动表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-01
+ */
+@Data
+public class VactInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 标题
+     */
+	private String title;
+
+    /**
+     * 活动头图
+     */
+	private String headPic;
+
+    /**
+     * 活动开始时间
+     */
+	private Date actStartTime;
+
+    /**
+     * 活动结束时间
+     */
+	private Date actEndTime;
+
+    /**
+     * 活动地点
+     */
+	private String actAddress;
+
+    /**
+     * 报名要求
+     */
+	private String requirement;
+
+    /**
+     * 活动内容
+     */
+	private String actContent;
+
+    /**
+     * 是否只允许志愿者参加  0否  1是
+     */
+	private String volunteerFlag;
+
+    /**
+     * 联系人
+     */
+	private String contacts;
+
+    /**
+     * 联系电话
+     */
+	private String tel;
+
+    /**
+     * 审核状态：0-审核中，5-未通过，10-待发布，15已发布
+     */
+	private String state;
+
+    /**
+     * 审核理由
+     */
+	private String reason;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 头像地址
+     */
+	private String faceImg;
+
+    /**
+     * 党员标识：0否1是
+     */
+	private String partyFlag;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 部门名称
+     */
+	private String deptName;
+
+    /**
+     * 所有部门ID
+     */
+	private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+	private String allDeptNames;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+	private String parentDeptNames;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VactOrgRelationDTO.java

@@ -0,0 +1,81 @@
+/**
+ * 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.volunteer;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 志愿活动 志愿组织 关联表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-09-01
+ */
+@Data
+public class VactOrgRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 志愿活动id
+     */
+	private String vactId;
+
+    /**
+     * 志愿组织id
+     */
+	private Long volunteerOrgId;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java

@@ -162,4 +162,9 @@ public class NoticeDTO implements Serializable {
 
     private String typeName;
 
-}
+    /**
+     * 索引图
+     */
+    private String imgUrl;
+
+}

epdc-cloud-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcContentDetailResultDTO.java

@@ -41,4 +41,9 @@ public class EpdcContentDetailResultDTO implements Serializable {
      * 浏览数
      */
     private String readingAmount;
+
+    /**
+     * 内容
+     */
+    private String noticeContent;
 }

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

@@ -0,0 +1,122 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 用户信息表 用户信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-08-31
+ */
+@Data
+public class UserInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标识号
+     */
+	private String id;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 头像地址
+     */
+	private String headUrl;
+
+    /**
+     * 名字
+     */
+    private String realName;
+
+    /**
+     * 电话
+     */
+    private String mobile;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 格言
+     */
+	private String motto;
+
+    /**
+     * 承诺
+     */
+	private String promise;
+
+    /**
+     * 服务范围
+     */
+	private String serviceArea;
+
+    /**
+     * 推荐标识 0-否，1-是
+     */
+	private String recommendFlag;
+
+    /**
+     * 推荐时间
+     */
+	private Date recommendTime;
+
+    /**
+     * 删除标识 0-否，1-是
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+
+}

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

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 亮身份详情
+ * create time: 2021/8/31$ 14:57$
+ */
+@Data
+public class EpdcAppIdentityDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = -951939570282533218L;
+
+    /**
+     *用户id
+     */
+    @NotBlank(message = "用户id不能为空")
+    private String userId;
+}

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

@@ -1,7 +1,9 @@
 package com.elink.esua.epdc.dto.epdc.form;
 
 import lombok.Data;
+import lombok.NonNull;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -17,7 +19,8 @@ public class EpdcAppShowIdentityFormDTO implements Serializable {
     /**
      *用户ID
      */
-    private Long userId;
+    @NotBlank(message = "用户id不为空")
+    private String userId;
 
     /**
      *头像地址