Browse Source

已认证党员查询

dev_shibei_match
zxc 5 years ago
parent
commit
207b4cf00c
  1. 32
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedFormDTO.java
  2. 42
      epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
  3. 17
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
  4. 12
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
  5. 7
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
  6. 17
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
  7. 18
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
  8. 22
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SelectGridNameByGridIdFormDTO.java
  9. 27
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SelectGridNameByGridIdResultDTO.java
  10. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  11. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  12. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  13. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  14. 12
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  15. 21
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/UserHeadPhotoDTO.java
  16. 32
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/CertifiedFormDTO.java
  17. 42
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java
  18. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  19. 17
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java
  20. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
  21. 7
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java
  22. 13
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java
  23. 13
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java
  24. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java
  25. 36
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java
  26. 15
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
  27. 26
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserHeadPhotoDTO.java
  28. 42
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
  29. 48
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java
  30. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
  31. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java
  32. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java
  33. 15
      epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

32
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedFormDTO.java

@ -0,0 +1,32 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 16:31
* 已认证党员列表
*/
@Data
public class CertifiedFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页数量
*/
private Integer pageSize;
/**
* 网格id
*/
private String gridId;
}

42
epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 15:45
* 已认证党员列表
*/
@Data
public class CertifiedResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 用户id
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 居民头像
*/
private String userHeadPhoto;
/**
* applyTime 申请时间
*/
private Integer applyTime;
/**
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
}

17
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@ -1,8 +1,12 @@
package com.epmet.controller;
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.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
import com.epmet.service.ResiPartyMemberService;
@ -48,6 +52,19 @@ public class ResiPartyMemberController {
public Result<List<AuditedPartyMemberResultDTO>> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) {
return resiPartyMemberService.audited(formDTO);
}
/**
*
* @Description 获取已认证党员
* @param: tokenDto
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 16:18
*/
@PostMapping(value = "/certified")
public Result<List<CertifiedResultDTO>> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){
return resiPartyMemberService.certifiedList(certifiedFormDTO);
}
}

12
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java

@ -2,6 +2,8 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
@ -87,4 +89,14 @@ public interface ResiPartymemberFeignClient {
**/
@PostMapping(value = "resi/partymember/partymemberbaseinfo/audited", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<List<ReviewedParyMemberResultDTO>> auditedPartyMember(@RequestBody ReviewedParyMemberFormDTO reviewedParyMemberFormDTO);
/**
* 查询已认证党员
* @Description
* @Author zxc
* @CreatedTime 2020/4/27 10:29
*/
@PostMapping(value = "/resi/partymember/partymemberinfo/certified")
Result<List<CertifiedResultDTO>> certified(@RequestBody CertifiedFormDTO certifiedFormDTO);
}

7
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java

@ -3,6 +3,8 @@ 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.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.resi.partymember.dto.partymember.form.ReviewedParyMemberFormDTO;
import com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO;
@ -57,4 +59,9 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "audited", reviewedParyMemberFormDTO);
}
@Override
public Result<List<CertifiedResultDTO>> certified(CertifiedFormDTO certifiedFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO);
}
}

17
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java

@ -1,8 +1,14 @@
package com.epmet.service;
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.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
@ -30,4 +36,15 @@ public interface ResiPartyMemberService {
* @Date 2020/4/26 23:32
**/
Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO);
Result auditing(AuditingPartyMemberFormDTO formDTO);
/**
*
* @Description 获取已认证党员
* @param: tokenDto
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 16:18
*/
Result<List<CertifiedResultDTO>> certifiedList(CertifiedFormDTO certifiedFormDTO);
}

18
epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java

@ -6,6 +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.CertifiedFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
import com.epmet.dto.result.AuditedPartyMemberResultDTO;
import com.epmet.dto.result.AuditingPartyMemberResultDTO;
import com.epmet.feign.ResiPartymemberFeignClient;
@ -19,6 +22,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
@ -66,5 +71,18 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);
return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
}
/**
*
* @Description 获取已认证党员
* @param: tokenDto
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 16:18
*/
@Override
public Result<List<CertifiedResultDTO>> certifiedList(CertifiedFormDTO certifiedFormDTO) {
return resiPartymemberFeignClient.certified(certifiedFormDTO);
}
}

22
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SelectGridNameByGridIdFormDTO.java

@ -0,0 +1,22 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-27 9:16
* 根据gridId查询GridNameDTO
*/
@Data
public class SelectGridNameByGridIdFormDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 网格id
*/
private String gridId;
}

27
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SelectGridNameByGridIdResultDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-27 9:16
* 根据gridId查询GridNameDTO
*/
@Data
public class SelectGridNameByGridIdResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 网格id
*/
private String gridId;
/**
* 网格名称
*/
private String gridName;
}

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
@ -127,6 +129,17 @@ public class CustomerGridController {
return new Result<CustomerGridDTO>().ok(data);
}
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
@PostMapping("selectGridNameByGridId")
public Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(@RequestBody SelectGridNameByGridIdFormDTO formDTO){
return customerGridService.selectGridNameByGridId(formDTO);
}
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>

12
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@ -18,11 +18,15 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.UserIdDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.form.DeleteGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.result.AddGridResultDTO;
@ -70,6 +74,14 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
SelectGridNameByGridIdResultDTO selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO);
/**
* @param userId
* @return

11
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@ -27,11 +27,14 @@ import com.epmet.dto.result.AddGridResultDTO;
import com.epmet.dto.form.CommonAgencyIdFormDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerGridEntity;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -121,6 +124,14 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
*/
Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO);
/**
* @param gridId
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GridInfoResultDTO>

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -32,7 +32,9 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.ListCustomerGridFormDTO;
import com.epmet.dto.form.SelectGridNameByGridIdFormDTO;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.dao.CustomerStaffGridDao;
import com.epmet.dto.*;
@ -460,4 +462,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
return new Result<GridInfoResultDTO>().ok(gridInfoResultDTO);
}
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 9:22
*/
@Override
public Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO) {
return new Result<SelectGridNameByGridIdResultDTO>().ok(baseDao.selectGridNameByGridId(formDTO));
}
}

12
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -93,6 +93,18 @@
</select>
<!-- -->
<select id="selectGridNameByGridId" parameterType="com.epmet.dto.form.SelectGridNameByGridIdFormDTO" resultType="com.epmet.dto.result.SelectGridNameByGridIdResultDTO">
SELECT
id AS gridId,
grid_name AS gridName
FROM
customer_grid
WHERE
id = #{gridId}
AND del_flag = 0
</select>
<select id="getMyGrids" resultType="com.epmet.dto.result.CustomerGridByUserIdResultDTO">
SELECT
cg.id AS 'gridId',

21
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/UserHeadPhotoDTO.java

@ -0,0 +1,21 @@
package com.epmet.resi.partymember.dto.partymember;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 17:52
*/
@Data
public class UserHeadPhotoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 头像地址
*/
private String userHeadPhoto;
}

32
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/CertifiedFormDTO.java

@ -0,0 +1,32 @@
package com.epmet.resi.partymember.dto.partymember.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 16:31
* 已认证党员列表
*/
@Data
public class CertifiedFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 页码
*/
private Integer pageNo;
/**
* 每页数量
*/
private Integer pageSize;
/**
* 网格id
*/
private String gridId;
}

42
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.resi.partymember.dto.partymember.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 15:45
* 已认证党员列表
*/
@Data
public class CertifiedResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 用户id
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 居民头像
*/
private String userHeadPhoto;
/**
* applyTime 申请时间
*/
private Long applyTime;
/**
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
}

10
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@ -6,8 +6,10 @@ import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.UserRoleDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
import com.epmet.resi.partymember.dto.partymember.UserHeadPhotoDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -59,4 +61,12 @@ public interface EpmetUserFeignClient {
@PostMapping("/epmetuser/userresiinfo/getuserresiinfolist")
Result<List<UserResiInfoResultDTO>> getUserResiInfoList(@RequestBody UserResiInfoListFormDTO userResiInfoListFormDTO);
/**
* 根据userId查询头像
* @param certifiedResultDTOS
* @return
*/
@PostMapping("/epmetuser/userwechat/selectuserheadphotobyuserid")
Result<List<CertifiedResultDTO>> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

17
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java

@ -1,12 +1,13 @@
package com.epmet.modules.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -39,4 +40,18 @@ public interface GovOrgFeignClient {
**/
@GetMapping("/gov/org/customergrid/getGridInfo/{gridId}")
Result<GridInfoResultDTO> queryGridInfo(@PathVariable("gridId") String gridId);
/**
*
* @Description 根据网格id查询网格名称
* @Author zxc
* @CreatedTime 2020/4/27 10:26
*/
@PostMapping("/gov/org/customergrid/selectGridNameByGridId")
Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(@RequestBody CertifiedFormDTO formDTO);
}

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@ -7,6 +7,7 @@ import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.UserRoleDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component;
@ -39,4 +40,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<List<UserResiInfoResultDTO>> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoList", userResiInfoListFormDTO);
}
@Override
public Result<List<CertifiedResultDTO>> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectUserHeadPhotoByUserId", certifiedResultDTOS);
}
}

7
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/GovOrgFeignClientFallBack.java

@ -5,8 +5,10 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.dto.result.GridInfoResultDTO;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.springframework.stereotype.Component;
/**
@ -31,4 +33,9 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
public Result<GridInfoResultDTO> queryGridInfo(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridInfo",gridId);
}
@Override
public Result<SelectGridNameByGridIdResultDTO> selectGridNameByGridId(CertifiedFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridNameByGridId",formDTO);
}
}

13
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java

@ -25,9 +25,11 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.modules.partymember.excel.PartymemberInfoExcel;
import com.epmet.modules.partymember.service.PartymemberInfoService;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -91,4 +93,15 @@ public class PartymemberInfoController {
ExcelUtils.exportExcelToTarget(response, null, list, PartymemberInfoExcel.class);
}
/**
*
* @Description 查询已认证党员
* @Author zxc
* @CreatedTime 2020/4/27 10:28
*/
@PostMapping(value = "certified")
public Result<List<CertifiedResultDTO>> certified(@RequestBody CertifiedFormDTO certifiedFormDTO){
return new Result<List<CertifiedResultDTO>>().ok(partymemberInfoService.certified(certifiedFormDTO));
}
}

13
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java

@ -18,10 +18,14 @@
package com.epmet.modules.partymember.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 党员认证信息表
*
@ -43,4 +47,13 @@ public interface PartymemberInfoDao extends BaseDao<PartymemberInfoEntity> {
* @return PartymemberInfoEntity
*/
PartymemberInfoEntity selectPartyMemberInfoByMobile(PartymemberInfoEntity param);
/**
*
* @Description 查询已认证党员
* @Author zxc
* @CreatedTime 2020/4/26 17:27
*/
List<CertifiedResultDTO> selectCertifiedList(CertifiedFormDTO certifiedFormDTO);
}

11
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java

@ -19,8 +19,10 @@ package com.epmet.modules.partymember.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import java.util.List;
import java.util.Map;
@ -113,4 +115,13 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
*/
PartymemberInfoDTO getPartyMemberInfoByMobile(PartymemberInfoEntity entity);
/**
*
* @Description 查询已认证党员列表
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 17:25
*/
List<CertifiedResultDTO> certified(CertifiedFormDTO certifiedFormDTO);
}

36
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@ -21,18 +21,26 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.dto.result.SelectGridNameByGridIdResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.modules.partymember.dao.PartymemberInfoDao;
import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
import com.epmet.modules.partymember.service.PartymemberInfoService;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
import com.epmet.resi.partymember.dto.partymember.form.CertifiedFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -51,6 +59,12 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
@Autowired
private PartymemberInfoDao partyMemberInfoDao;
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Override
public PageData<PartymemberInfoDTO> page(Map<String, Object> params) {
IPage<PartymemberInfoEntity> page = baseDao.selectPage(
@ -115,5 +129,27 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
return ConvertUtils.sourceToTarget(result, PartymemberInfoDTO.class);
}
/**
*
* @Description 查询已认证党员列表
* @param: certifiedFormDTO
* @Author zxc
* @CreatedTime 2020/4/26 17:26
*/
@Override
public List<CertifiedResultDTO> certified(CertifiedFormDTO certifiedFormDTO) {
certifiedFormDTO.setPageNo(certifiedFormDTO.getPageNo() - NumConstant.ONE);
List<CertifiedResultDTO> certifiedResultDTOS = partyMemberInfoDao.selectCertifiedList(certifiedFormDTO);
if (certifiedResultDTOS.size()==0){
return new ArrayList<>();
}
Result<List<CertifiedResultDTO>> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS);
Result<SelectGridNameByGridIdResultDTO> gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO);
for (CertifiedResultDTO datum : listResult.getData()) {
datum.setGridFullPath(gridName.getData().getGridName());
}
return listResult.getData();
}
}

15
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@ -58,5 +58,20 @@
AND DEL_FLAG = 0
</select>
<!-- 查询已认证党员 -->
<select id="selectCertifiedList" resultType="com.epmet.dto.result.CertifiedResultDTO">
SELECT
user_id AS userId,
CONCAT(surname,name) AS realName,
UNIX_TIMESTAMP( created_time ) AS applyTime
FROM
partymember_info
WHERE
grid_id = #{gridId}
AND confirm_result IN ( 'auto_confirm_success', 'approved' )
AND del_flag = 0
LIMIT #{pageNo},#{pageSize}
</select>
</mapper>

26
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserHeadPhotoDTO.java

@ -0,0 +1,26 @@
package com.epmet.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 17:52
*/
@Data
public class UserHeadPhotoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 用户id
*/
private String userId;
/**
* 头像地址
*/
private String userHeadPhoto;
}

42
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Auther zxc
* @Create 2020-04-26 15:45
* 已认证党员列表
*/
@Data
public class CertifiedResultDTO implements Serializable {
private static final long serialVersionUID = -1L;
/**
* 用户id
*/
private String userId;
/**
* 真实姓名
*/
private String realName;
/**
* 居民头像
*/
private String userHeadPhoto;
/**
* applyTime 申请时间
*/
private Integer applyTime;
/**
* 提交网格XXX街道-XXX社区-XXX网格
*/
private String gridFullPath;
}

48
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java

@ -0,0 +1,48 @@
/**
* 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.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserHeadPhotoDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.service.UserWechatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 用户微信端关系表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-26
*/
@RestController
@RequestMapping("userwechat")
public class UserWechatController {
@Autowired
private UserWechatService userWechatService;
@PostMapping(value = "/selectuserheadphotobyuserid")
public Result<List<CertifiedResultDTO>> selectUserHeadPhotoByUserId(@RequestBody List<CertifiedResultDTO> certifiedResultDTOS){
return new Result<List<CertifiedResultDTO>>().ok(userWechatService.selectUserHeadPhotoByUserId(certifiedResultDTOS));
}
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java

@ -2,8 +2,10 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.UserDTO;
import com.epmet.dto.UserHeadPhotoDTO;
import com.epmet.dto.UserWechatDTO;
import com.epmet.dto.form.WxLoginUserInfoFormDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -45,4 +47,12 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
* @Date 2020.03.30 17:25
**/
List<UserWechatEntity> selectByUserId(@Param("userId")String userId);
/**
*
* @Description 根据userId查询头像
* @Author zxc
* @CreatedTime 2020/4/26 18:53
*/
List<UserHeadPhotoDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java

@ -1,8 +1,12 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
import java.util.List;
/**
* @Description
* @IntefaceName UserWechatService
@ -11,4 +15,6 @@ import com.epmet.entity.UserWechatEntity;
*/
public interface UserWechatService extends BaseService<UserWechatEntity> {
List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS);
}

22
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java

@ -3,11 +3,16 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.dao.UserWechatDao;
import com.epmet.dto.UserHeadPhotoDTO;
import com.epmet.dto.result.CertifiedResultDTO;
import com.epmet.entity.UserWechatEntity;
import com.epmet.service.UserWechatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
/**
* @Description
@ -15,6 +20,23 @@ import java.util.Collection;
* @Author wangc
* @date 2020.03.28 14:42
*/
@Service
public class UserWechatServiceImpl extends BaseServiceImpl<UserWechatDao, UserWechatEntity> implements UserWechatService{
@Autowired
private UserWechatDao userWechatDao;
@Override
public List<CertifiedResultDTO> selectUserHeadPhotoByUserId(List<CertifiedResultDTO> certifiedResultDTOS) {
List<UserHeadPhotoDTO> userHeadPhotoDTOS = userWechatDao.selectUserHeadPhotoByUserId(certifiedResultDTOS);
for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) {
for (UserHeadPhotoDTO userHeadPhotoDTO : userHeadPhotoDTOS) {
if (userHeadPhotoDTO.getUserId().equals(certifiedResultDTO.getUserId())){
certifiedResultDTO.setUserHeadPhoto(userHeadPhotoDTO.getUserHeadPhoto());
break;
}
}
}
return certifiedResultDTOS;
}
}

15
epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@ -64,4 +64,19 @@
USER_ID = #{userId}
</select>
<!-- 根据userId查询头像 -->
<select id="selectUserHeadPhotoByUserId" resultType="com.epmet.dto.UserHeadPhotoDTO">
SELECT
user_id AS userId,
IFNULL(head_img_url,'') AS userHeadPhoto
FROM
user_wechat
WHERE
user_id in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item.userId}
</foreach>
AND del_flag = 0
</select>
</mapper>

Loading…
Cancel
Save