Browse Source

解决Git服务误删、错提文件问题

dev_shibei_match
sunyuchao 5 years ago
parent
commit
0205356fb2
  1. 2
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
  2. 102
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberBaseInfoDTO.java
  3. 138
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java
  4. 102
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmManualDTO.java
  5. 147
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java
  6. 102
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java
  7. 102
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberVisitDTO.java
  8. 0
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep
  9. 0
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep
  10. 107
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java
  11. 102
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedVisitDTO.java
  12. 0
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep
  13. 59
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java
  14. 0
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep
  15. 45
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java

2
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
* @Description 居民端陌生人导览 调用epmet-user服务
* @Author sun
*/
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,url="http://localhost:8096")
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
public interface ResiPartymemberFeignClient {
/**

102
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberBaseInfoDTO.java

@ -0,0 +1,102 @@
/**
* 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.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 党员库基本信息表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class PartymemberBaseInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 姓名
*/
private String name;
/**
* 身份证号
*/
private String idCard;
/**
* 手机号
*/
private String mobile;
/**
* 所在党组织
*/
private String organization;
/**
* 所在党支部
*/
private String branch;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

138
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java

@ -0,0 +1,138 @@
/**
* 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.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 党员认证自动审核表
只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class PartymemberConfirmAutoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 党员认证信息表Id
*/
private String partymemberInfoId;
/**
* 党员库Id
*/
private String patryMemberBaseInfoId;
/**
* 录入姓名
*/
private String inputName;
/**
* 党员库姓名
*/
private String baseName;
/**
* 姓名比对结果
*/
private String nameResult;
/**
* 录入手机号
*/
private String inputMobile;
/**
* 党员库手机号
*/
private String baseMobile;
/**
* 手机号比对结果
*/
private String mobileResult;
/**
* 录入身份证号
*/
private String inputIdCard;
/**
* 党员库身份证号
*/
private String baseIdCard;
/**
* 身份证比对结果
*/
private String idCardResult;
/**
* 整体结果 11:完全匹配 10:大部分匹配 01:小部分匹配 00:完全不匹配
*/
private String result;
/**
* 比对时间
*/
private Date contrastTime;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmManualDTO.java

@ -0,0 +1,102 @@
/**
* 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.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 党员认证人工审核表 人工审核时要展示自动审核的结果同事允许前台去修改党员认证信息表的数据
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class PartymemberConfirmManualDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 用户Id (user.id)
*/
private String userId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* partymember_info表Id (partymember_info.id)
*/
private String partymemberInfoId;
/**
* 审核状态 key:audit_status,value:(under_auditting:待审核approved:通过rejected :未通过)
*/
private String auditStatus;
/**
* 拒绝理由
*/
private String refuseReason;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

147
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java

@ -0,0 +1,147 @@
/**
* 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.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 党员认证信息表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class PartymemberInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 用户Id (user.id)
*/
private String userId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* partymember_visit.id
*/
private String partymemberVisitId;
/**
* 认证结果(0:成功 1:失败)
*/
private String confirmResult;
/**
* 姓氏
*/
private String surname;
/**
* 名称
*/
private String name;
/**
* 身份证号
*/
private String idCard;
/**
* 手机号
*/
private String mobile;
/**
* 街道
*/
private String street;
/**
* 小区名称
*/
private String estate;
/**
* 楼栋单元
*/
private String building;
/**
* 党组织关系(工作单位或其他街道)
*/
private String extraOrganization;
/**
* 证明人姓名
*/
private String extraCertifierName;
/**
* 证明人电话
*/
private String extraCertifierMobile;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java

@ -0,0 +1,102 @@
/**
* 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.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 党员注册关系表 用于统计客户网格的认证党员数
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class PartymemberRegisterRelationDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* 用户Id (user.id)
*/
private String userId;
/**
* 首次注册用户 (0表示不参与计数 1表示参与计数)
*/
private String firstRegister;
/**
* 注册用户 (0表示不参与计数 1表示参与计数)
*/
private String register;
/**
* 参与用户 (0表示不参与计数 1表示参与计数)
*/
private String partake;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberVisitDTO.java

@ -0,0 +1,102 @@
/**
* 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.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 党员认证行为记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class PartymemberVisitDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 用户Id (user.id)
*/
private String userId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* 认证来源(value:feature+action)
*/
private String visitFrom;
/**
* 访问时间
*/
private Date visitTime;
/**
* 操作行为 key:operate_visit value:initialize:初始化 sms_Code:获取验证码 success:提交成功 faild:提交失败页面初始化手机号验证码获取提交后(验证码是否正确数据库数据保存是否成功)成功提交后(验证码输入错误或者数据保存错误)失败四种行为
*/
private String operateVisit;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

0
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep

0
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep

107
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java

@ -0,0 +1,107 @@
/**
* 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.epmet.resi.partymember.dto.warmhearted;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 热心居民申请表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class ResiWarmheartedApplyDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* 用户Id (user.id)
*/
private String userId;
/**
* 热心居民申请理由 (300字)
*/
private String reason;
/**
* 审核状态 key:audit_status,value:(under_auditting:待审核approved:通过rejected :未通过)
*/
private String auditStatus;
/**
* 拒绝理由
*/
private String refuseReason;
/**
* 热心居民申请行为记录表Id (resi_warmhearted_visit.id)
*/
private String resiWarmVisitId;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人审核人ID
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

102
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedVisitDTO.java

@ -0,0 +1,102 @@
/**
* 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.epmet.resi.partymember.dto.warmhearted;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 热心居民申请行为记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
*/
@Data
public class ResiWarmheartedVisitDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* 用户Id user.id
*/
private String userId;
/**
* 申请来源(value:feature+action)
*/
private String visitFrom;
/**
* 访问时间
*/
private Date visitTime;
/**
* 操作行为 key:operate_visit value:initialize:初始化 success:提交成功 faild:提交失败
*/
private String operateVisit;
/**
* 删除标识0.未删除 1.已删除
*/
private Integer delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

0
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep

59
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java

@ -0,0 +1,59 @@
/**
* 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.epmet.resi.partymember.dto.warmhearted.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-居民注册页面初始化-居民访问记录表新增数据-配置入参
* @author sun
*/
@Data
public class ResiWarmheartedFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户Id CUSTOMER.id
*/
@NotBlank(message = "客户ID不能为空")
private String customerId;
/**
* 网格Id
*/
@NotBlank(message = "网格ID不能为空")
private String gridId;
/**
* 访问来源 指的是用户点的那个功能进入到的注册页面就是一个功能模块的Idvalue:feature+action
*/
@NotBlank(message = "访问来源不能为空")
private String visitFrom;
/**
* 用户Id
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
}

0
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep

45
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java

@ -0,0 +1,45 @@
/**
* 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.epmet.resi.partymember.dto.warmhearted.result;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 居民端-热心居民申请页面初始化-查询有无申请新增访问行为记录数据-配置入参
* @author sun
*/
@Data
public class ResiWarmheartedResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 是否已申请热心居民 0 1
*/
private String isApplied;
/**
* 热心居民申请访问记录表(resi_warmhearted_visit)Id
*/
private String resiWarmheartedVisitId;
}
Loading…
Cancel
Save