Merge remote-tracking branch 'origin/master'

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/VerificationFreeUserDTO.java

@@ -0,0 +1,108 @@
+/**
+ * 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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 免校验PC用户（针对隐私数据，免验证码校验）
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2021-12-22
+ */
+@Data
+public class VerificationFreeUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 用户管理表主键
+     */
+	private Long sysUserId;
+
+    /**
+     * 校验标识 0：否，1：是
+     */
+	private String verificationFlag;
+
+    /**
+     * 删除标识 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+	// sys_ser 关联属性
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 所属部门
+     */
+    private String deptName;
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncDTO.java

@@ -0,0 +1,366 @@
+/**
+ * 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.analysis.pc.epidemic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 基础信息同步记录表
+ *
+ * @author zhy qu@elink-cn.com
+ * @since v1.0.0 2022-01-07
+ */
+@Data
+public class DsfUserInfoSyncDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private Long id;
+
+    /**
+     * 姓名
+     */
+	private String userName;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 户籍地code
+     */
+	private String householdRegisterCode;
+
+    /**
+     * 户籍地名称
+     */
+	private String householdRegisterName;
+
+    /**
+     * 户籍地详细地址
+     */
+	private String householdRegisterDetail;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 民族
+     */
+	private String nation;
+
+    /**
+     * 曾用名
+     */
+	private String formerName;
+
+    /**
+     * 出生年月
+     */
+	private String birthday;
+
+    /**
+     * 身高
+     */
+	private String height;
+
+    /**
+     * 文化程度
+     */
+	private String standardOfCulture;
+
+    /**
+     * 健康情况
+     */
+	private String health;
+
+    /**
+     * 婚姻状况
+     */
+	private String maritalStatus;
+
+    /**
+     * 与户主关系
+     */
+	private String relation;
+
+    /**
+     * 国籍
+     */
+	private String nationality;
+
+    /**
+     * 政治面貌
+     */
+	private String politicsStatus;
+
+    /**
+     * 宗教信仰
+     */
+	private String faith;
+
+    /**
+     * 毕业院校
+     */
+	private String graduateSchool;
+
+    /**
+     * 专业
+     */
+	private String professional;
+
+    /**
+     * 工作状态
+     */
+	private String workStatus;
+
+    /**
+     * 行业类别
+     */
+	private String industryCategory;
+
+    /**
+     * 工作单位（现/原）
+     */
+	private String workUnits;
+
+    /**
+     * 兵役状况
+     */
+	private String military;
+
+    /**
+     * 人口类别
+     */
+	private String peopleCategories;
+
+    /**
+     * 特殊人群
+     */
+	private String specialCrowd;
+
+    /**
+     * 有无车辆
+     */
+	private String car;
+
+    /**
+     * 车牌号
+     */
+	private String carNo;
+
+    /**
+     * 人户状况
+     */
+	private String hushaiStatus;
+
+    /**
+     * 籍贯
+     */
+	private String nativePlace;
+
+    /**
+     * 血型
+     */
+	private String bloodType;
+
+    /**
+     * 手机号或座机号
+     */
+	private String mobile;
+
+    /**
+     * 往返情况(1:在平阴 2在外地)
+     */
+	private String returnState;
+
+    /**
+     * 县内居住地code
+     */
+	private String liveAddressCode;
+
+    /**
+     * 县内居住地镇街
+     */
+	private String liveAddressName;
+
+    /**
+     * 县内居住地详细地址
+     */
+	private String liveAddressDetail;
+
+    /**
+     * 县内居住地关联人
+     */
+	private String relationPeople;
+
+    /**
+     * 县内居住地关联人手机号或座机号
+     */
+	private String relationPeopleMobile;
+
+    /**
+     * 现居住地code
+     */
+	private String outLiveAddressCode;
+
+    /**
+     * 现居住地名称
+     */
+	private String outLiveAddressName;
+
+    /**
+     * 现居住地详细地址
+     */
+	private String outLiveAddressDetail;
+
+    /**
+     * 现居住地疫情风险等级(1:低风险，2：中风险，3：高风险)
+     */
+	private String riskGrade;
+
+    /**
+     * 拟返回平阴时间
+     */
+	private String goBarkTime;
+
+    /**
+     * 拟离开平阴时间
+     */
+	private String leaveTime;
+
+    /**
+     * 拟去往目的地code
+     */
+	private String destinationAddressCode;
+
+    /**
+     * 拟去往目的地名称
+     */
+	private String destinationAddressName;
+
+    /**
+     * 拟去往目的地详细地址
+     */
+	private String destinationAddressDetail;
+
+    /**
+     *
+     */
+	private String communityId;
+
+    /**
+     * 社区/村庄
+     */
+	private String community;
+
+    /**
+     *
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 小区
+     */
+	private String plot;
+
+    /**
+     * 楼号
+     */
+	private String buildingNo;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房间号
+     */
+	private String roomNo;
+
+    /**
+     * 房屋性质
+     */
+	private String houseProperty;
+
+    /**
+     * 家庭保障情况
+     */
+	private String familySecurity;
+
+    /**
+     * 居住情况
+     */
+	private String livingSituation;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private String createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private String updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 同步时间
+     */
+	private String syncDate;
+
+    /**
+     * 同步状态，空：未同步，0同步成功，1同步失败
+     */
+	private String syncFlag;
+
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/DsfUserInfoSyncTotalDTO.java

@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.dto.analysis.pc.epidemic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: epdc-cloud-analysis-pc-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2022-01-12 09:23
+ **/
+@Data
+public class DsfUserInfoSyncTotalDTO implements Serializable {
+
+
+    private List<DsfUserInfoSyncDTO> list;
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/epidemic/EpidemicUserSyncDTO.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.analysis.pc.epidemic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ *
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2022-01-11
+ */
+@Data
+public class EpidemicUserSyncDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 同步时间
+     */
+	private Date syncDate;
+
+}

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/form/EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO.java

@@ -18,13 +18,11 @@ public class EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO implements
     /**
      *页码 -必传项
      */
-    @NotNull(message = "页码 不能为空")
     private Integer pageIndex;
 
     /**
      * 页容量  -必传项
      */
-    @NotNull(message = "页容量 不能为空")
     private Integer pageSize;
 
     /**

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO.java

@@ -63,4 +63,9 @@ public class EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO implement
      */
     private String latitude;
 
+    /**
+     * 接种率
+     */
+    private String vaccinationRatio;
+
 }

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenAgencyGovernDailyResultDTO.java

@@ -120,7 +120,7 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
     private Integer inGroupTopicUnResolvedCount;
 
     /**
-     * 11、未出当前组织的，结案项目数
+     * （改）13、当前组织内结案的项目中：由网格结案的项目总数
      */
     private Integer gridSelfGovernProjectTotal;
 
@@ -135,7 +135,17 @@ public class ScreenAgencyGovernDailyResultDTO implements Serializable {
     private Integer streetClosedCount;
 
     /**
-     * 当前组织内出来的项目：由区直部门(已解决+未解决)结案的项目总数
+     * （改）16、当前组织内结案的项目中：由区直部门结案的项目总数
      */
     private Integer districtDeptClosedCount;
+
+    /**
+     * （新增）11、当前组织内：来源于事件的项目：结案已解决数
+     */
+    private Integer eventResolvedCount;
+
+    /**
+     * （新增）12、当前组织内：来源于事件的项目：结案无需解决数
+     */
+    private Integer eventUnResolvedCount;
 }

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/ScreenGridGovernDailyResultDTO.java

@@ -135,7 +135,7 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
     private Integer fromAgencyUnResolvedInGridCount;
 
     /**
-     * 15、未出当前网格的，结案项目数=11+12+13+14
+     * （改）17、当前网格内出来的项目：由网格结案(已解决+未解决)的项目总数
      */
     private Integer gridSelfGovernProjectTotal;
 
@@ -153,4 +153,14 @@ public class ScreenGridGovernDailyResultDTO implements Serializable {
      * 当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数
      */
     private Integer districtDeptClosedCount;
+
+    /**
+     * （新）15、当前网格内：来源于事件的项目：结案已解决数
+     */
+    private Integer eventResolvedCount;
+
+    /**
+     * （新）16、当前网格内：来源于事件的项目：结案无需解决数
+     */
+    private Integer eventUnResolvedCount;
 }

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java

@@ -142,4 +142,43 @@ public class PointsLogsDTO implements Serializable {
      */
     private String status;
 
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户真实姓名
+     */
+    private String realName;
 }

epdc-cloud-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointsLogsAddFormDTO.java

@@ -92,4 +92,33 @@ public class PointsLogsAddFormDTO {
      */
     private Integer lavePoints;
 
+    /**
+     * 网格
+     */
+    private String grid;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 }

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

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epdc-cloud-user-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2022-02-13 14:34
+ **/
+@Data
+public class PointsUpdateFormDTO implements Serializable {
+
+    /**
+     * 行为类型：
+     *      双十信息更新-double_info_update
+     *      网格巡查-grid_patrol
+     *      网格上报事件-grid_report_event
+     *      网格工作上传-grid_work_upload
+     */
+    private String behaviorType;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+}

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

@@ -0,0 +1,92 @@
+/**
+ * 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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 用户签到表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-07-21
+ */
+@Data
+public class UserSignDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 用户ID
+     */
+	private String userId;
+
+    /**
+     * 连续签到天数
+     */
+	private Integer consequentSignDays;
+
+    /**
+     * 最近签到时间
+     */
+	private Date lastSignTime;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 用户认证网格
+     */
+	private Long gridId;
+
+}

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

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

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

@@ -36,4 +36,9 @@ public class EpdcUserInfoResultDTO implements Serializable {
      */
     private String showIdentityFlag;
 
+    /**
+     * 用户今天是否签到
+     */
+    private Integer isSignUp;
+
 }