diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/CertifiedFormDTO.java new file mode 100644 index 0000000000..5cf5b6ae2d --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java new file mode 100644 index 0000000000..f7540d8b0b --- /dev/null +++ b/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; + +} 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 565127f1db..18e000ed9a 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 @@ -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> 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> certifiedList(@LoginUser TokenDto tokenDto, @RequestBody CertifiedFormDTO certifiedFormDTO){ + return resiPartyMemberService.certifiedList(certifiedFormDTO); + } } 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 8bee3c6646..c26f3978e6 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,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> auditedPartyMember(@RequestBody ReviewedParyMemberFormDTO reviewedParyMemberFormDTO); + + /** + * 查询已认证党员 + * @Description + * @Author zxc + * @CreatedTime 2020/4/27 10:29 + */ + @PostMapping(value = "/resi/partymember/partymemberinfo/certified") + Result> certified(@RequestBody CertifiedFormDTO certifiedFormDTO); + } 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 a5151d6503..81621574bd 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,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> certified(CertifiedFormDTO certifiedFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "certified", certifiedFormDTO); + } + } 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 f6171b98e1..91ae11adb0 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,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> audited(AuditedPartyMemberFormDTO formDTO); + Result auditing(AuditingPartyMemberFormDTO formDTO); + + /** + * + * @Description 获取已认证党员 + * @param: tokenDto + * @param: certifiedFormDTO + * @Author zxc + * @CreatedTime 2020/4/26 16:18 + */ + Result> certifiedList(CertifiedFormDTO certifiedFormDTO); } 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 9809bdcb37..2345960135 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,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>().ok(list); } + + /** + * + * @Description 获取已认证党员 + * @param: tokenDto + * @param: certifiedFormDTO + * @Author zxc + * @CreatedTime 2020/4/26 16:18 + */ + @Override + public Result> certifiedList(CertifiedFormDTO certifiedFormDTO) { + return resiPartymemberFeignClient.certified(certifiedFormDTO); + } } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SelectGridNameByGridIdFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/SelectGridNameByGridIdFormDTO.java new file mode 100644 index 0000000000..ebee9233e7 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SelectGridNameByGridIdResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/SelectGridNameByGridIdResultDTO.java new file mode 100644 index 0000000000..ed121519a6 --- /dev/null +++ b/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; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 2f6fee3031..77e3b82908 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/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().ok(data); } + /** + * + * @Description 根据网格id查询网格名称 + * @Author zxc + * @CreatedTime 2020/4/27 9:22 + */ + @PostMapping("selectGridNameByGridId") + public Result selectGridNameByGridId(@RequestBody SelectGridNameByGridIdFormDTO formDTO){ + return customerGridService.selectGridNameByGridId(formDTO); + } + /** * @param gridId * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index aa3e8ddf5e..37e60a010a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/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 { CustomerGridDTO getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO); + /** + * + * @Description 根据网格id查询网格名称 + * @Author zxc + * @CreatedTime 2020/4/27 9:22 + */ + SelectGridNameByGridIdResultDTO selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO); + /** * @param userId * @return diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index 6001753a03..cb9c9724e2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/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 { */ Result getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO); + /** + * + * @Description 根据网格id查询网格名称 + * @Author zxc + * @CreatedTime 2020/4/27 9:22 + */ + Result selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO); + /** * @param gridId * @return com.epmet.commons.tools.utils.Result diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index cdde922137..b5a83ee724 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/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().ok(gridInfoResultDTO); } + /** + * + * @Description 根据网格id查询网格名称 + * @Author zxc + * @CreatedTime 2020/4/27 9:22 + */ + @Override + public Result selectGridNameByGridId(SelectGridNameByGridIdFormDTO formDTO) { + return new Result().ok(baseDao.selectGridNameByGridId(formDTO)); + } + } 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 ec0712bc8d..7af8c21e98 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,6 +93,18 @@ + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserHeadPhotoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserHeadPhotoDTO.java new file mode 100644 index 0000000000..03aa0bff0b --- /dev/null +++ b/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; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java new file mode 100644 index 0000000000..f7540d8b0b --- /dev/null +++ b/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; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java new file mode 100644 index 0000000000..d077a55188 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserWechatController.java @@ -0,0 +1,48 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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> selectUserHeadPhotoByUserId(@RequestBody List certifiedResultDTOS){ + return new Result>().ok(userWechatService.selectUserHeadPhotoByUserId(certifiedResultDTOS)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java index d4fecbc78b..6d03a46a9c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java +++ b/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{ * @Date 2020.03.30 17:25 **/ List selectByUserId(@Param("userId")String userId); + + /** + * + * @Description 根据userId查询头像 + * @Author zxc + * @CreatedTime 2020/4/26 18:53 + */ + List selectUserHeadPhotoByUserId(List certifiedResultDTOS); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java index 2141cc6f4b..8d6f6cbdb0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserWechatService.java +++ b/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 { + List selectUserHeadPhotoByUserId(List certifiedResultDTOS); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java index 6a7c5807d4..3231224271 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserWechatServiceImpl.java +++ b/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 implements UserWechatService{ + @Autowired + private UserWechatDao userWechatDao; + + @Override + public List selectUserHeadPhotoByUserId(List certifiedResultDTOS) { + List 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; + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index 08e6a3ad9e..955dca114d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -64,4 +64,19 @@ USER_ID = #{userId} + + +