diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java new file mode 100644 index 0000000000..51dd48ddd8 --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedDetailFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 13:33 + * 已认证党员详情 + */ +@Data +public class CertifiedDetailFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 党员认证信息表ID + */ + @NotBlank(message = "党员认证信息表ID不能为空") + private String partyMemberId; + + /** + * 党员自动审核表ID + */ + private String autoId; + + /** + * 党员人工审核表ID + */ + private String manualId; + +} diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java new file mode 100644 index 0000000000..a14c38629e --- /dev/null +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java @@ -0,0 +1,72 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 13:37 + * 已认证党员详情 + */ +@Data +public class CertifiedDetailResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 用户id + */ + private String userId; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 联系手机号 + */ + private String mobile; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 认证网格：XXX街道-XXX社区-XXX网格 + */ + private String gridFullPath; + + /** + * 认证方式：自动认证auto、人工认证manual + */ + private String certifyType; + + /** + * 认证时间（提交认证的时间） + */ + private Long applyTime; + + /** + * 注册时间（进入本平台的时间） + */ + private Long certifyTime; + + /** + * 工作单位/所处街道 + */ + private String extraOrganization; + + /** + * 证明联系人 + */ + private String contactPeople; + + /** + * 证明联系人手机号 + */ + private String contactMobile; + +} diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java index de92cc128b..5188fbde8e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java @@ -5,7 +5,9 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; @@ -73,6 +75,18 @@ public class ResiPartyMemberController { return resiPartyMemberService.certifiedList(certifiedFormDTO); } + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 13:54 + */ + @PostMapping(value = "/certifieddetail") + public Result certifiedDetail(@RequestBody CertifiedDetailFormDTO formDTO){ + return new Result().ok(resiPartyMemberService.certifiedDetail(formDTO)); + } + /** * 审核党员 * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java index 25b586513b..5d8499704e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java @@ -2,7 +2,9 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; import com.epmet.resi.partymember.dto.partymember.form.*; @@ -97,6 +99,16 @@ public interface ResiPartymemberFeignClient { @PostMapping(value = "/resi/partymember/partymemberinfo/certified") Result> certified(@RequestBody CertifiedFormDTO certifiedFormDTO); + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 15:22 + */ + @PostMapping(value = "/resi/partymember/partymemberinfo/certifieddetail") + Result certifiedDetail(@RequestBody CertifiedDetailFormDTO formDTO); + /** * 审核党员 * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java index aedb5b3d0e..acab85141f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -3,7 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.resi.partymember.dto.partymember.form.*; @@ -62,6 +64,11 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO); } + @Override + public Result certifiedDetail(CertifiedDetailFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certifiedDetail", formDTO); + } + @Override public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manualConfirmResult", fromDTO); diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java index 93512bde0e..f0a2bdb58e 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java @@ -1,14 +1,19 @@ package com.epmet.service; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import java.util.List; import com.epmet.dto.result.AuditedPartyMemberResultDTO; import com.epmet.dto.result.AuditingPartyMemberResultDTO; +import org.springframework.web.bind.annotation.RequestBody; import com.epmet.resi.partymember.dto.partymember.form.AuditingDetailFromDTO; import com.epmet.resi.partymember.dto.partymember.form.AutoFailedDetailFromDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberConfirmFromDTO; @@ -52,6 +57,16 @@ public interface ResiPartyMemberService { */ Result> certifiedList(CertifiedFormDTO certifiedFormDTO); + + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 14:23 + */ + CertifiedDetailResultDTO certifiedDetail(CertifiedDetailFormDTO formDTO); + /** * 人工审核结果 * diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java index a97b886619..68482892fb 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java @@ -6,7 +6,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.AuditedPartyMemberFormDTO; import com.epmet.dto.form.AuditingPartyMemberFormDTO; +import com.epmet.dto.form.CertifiedDetailFormDTO; import com.epmet.dto.form.CertifiedFormDTO; +import com.epmet.dto.result.CertifiedDetailResultDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.feign.ResiPartymemberFeignClient; import com.epmet.dto.result.AuditedPartyMemberResultDTO; @@ -83,6 +85,20 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService { return resiPartymemberFeignClient.certified(certifiedFormDTO); } + /** + * + * @Description 已认证党员详情 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 13:54 + */ + @Override + public CertifiedDetailResultDTO certifiedDetail(CertifiedDetailFormDTO formDTO) { + CertifiedDetailResultDTO partyMemberDetail = resiPartymemberFeignClient.certifiedDetail(formDTO).getData(); + + return partyMemberDetail; + } + @Override public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { return resiPartymemberFeignClient.manualConfirmResult(fromDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 012d59d276..e6ac610f3c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -93,7 +93,7 @@ - + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java new file mode 100644 index 0000000000..409617bc88 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CreatedTimeByUserIdFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 16:08 + */ +@Data +public class CreatedTimeByUserIdFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private String userId; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java new file mode 100644 index 0000000000..d86ec53f57 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CreatedTimeByUserIdResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Auther zxc + * @Create 2020-04-27 16:08 + */ +@Data +public class CreatedTimeByUserIdResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 注册时间 (empet_user库下的user表中的 created_time) + */ + private Long registerTime; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index 6081d38fe1..5a310b3a87 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -8,9 +8,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -86,4 +88,15 @@ public class UserController { return userService.updateWxUserInfo(wxUserInfoFormDTO); } + /** + * + * @Description 查询用户注册时间 + * @Author zxc + * @CreatedTime 2020/4/27 16:14 + */ + @PostMapping("selectcreatedtimebyuserid") + public Result createdTimeByUserId(@RequestBody CreatedTimeByUserIdFormDTO formDTO){ + return new Result().ok(userService.createdTimeByUserId(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java index a015e34805..62a09ab69e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java @@ -1,6 +1,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +25,14 @@ public interface UserDao extends BaseDao { PasswordLoginUserInfoResultDTO selectOperUserByPhone(String phone); + /** + * + * @Description 查询用户注册时间 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 16:17 + */ + CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO); + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 09cd2e5bd1..6a9ea0b96a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -5,9 +5,11 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; @@ -55,4 +57,13 @@ public interface UserService extends BaseService { * @Description 居民端个人信息-同步用户微信信息 **/ Result updateWxUserInfo(WxUserInfoFormDTO wxUserInfoFormDTO); + + /** + * + * @Description 查询用户注册时间 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 16:14 + */ + CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 3d9e344e2a..d20564dadb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -8,9 +8,11 @@ import com.epmet.dao.UserDao; import com.epmet.dao.UserWechatDao; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; +import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; @@ -109,4 +111,18 @@ public class UserServiceImpl extends BaseServiceImpl implem userWechatDao.updateByUserId(userWechatDTO); return new Result(); } + + /** + * + * @Description 查询用户注册时间 + * @param: formDTO + * @Author zxc + * @CreatedTime 2020/4/27 16:14 + */ + @Override + public CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO) { + CreatedTimeByUserIdResultDTO registerTime = baseDao.createdTimeByUserId(formDTO); + registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L); + return registerTime; + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index 34b509b54d..5d34b7878d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -15,4 +15,15 @@ AND ou.PHONE = #{phone} + + +