From 84c6c5d9658b952d587d51844aeb3e054f70089f Mon Sep 17 00:00:00 2001 From: luyan Date: Mon, 7 Aug 2023 14:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/UserFeignClient.java | 10 ++++- .../fallback/UserFeignClientFallback.java | 5 +++ .../epdc/service/impl/AppUserServiceImpl.java | 15 ++++++- .../controller/EpdcAppUserController.java | 5 +++ .../com/elink/esua/epdc/user/dao/UserDao.java | 2 + .../esua/epdc/user/service/UserService.java | 3 ++ .../user/service/impl/UserServiceImpl.java | 14 +++++-- .../src/main/resources/mapper/UserDao.xml | 39 +++++++++++++++++++ 8 files changed, 87 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 894b34a70..5f5d40ce1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -30,8 +30,8 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/7 9:27 */ -//@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class) -@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://127.0.0.1:9068") +@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class) +//@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class, url = "http://127.0.0.1:9068") public interface UserFeignClient { /** @@ -359,6 +359,9 @@ public interface UserFeignClient { @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + @PostMapping(value = "app-user/epdc-app/user/npmNeedCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result npmNeedCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + /** * 根据用户ID需要缓存的用户信息 * @@ -495,6 +498,7 @@ public interface UserFeignClient { /** * 红色尖兵 + * * @param dto * @return */ @@ -503,6 +507,7 @@ public interface UserFeignClient { /** * 骑士先锋 + * * @param dto * @return */ @@ -511,6 +516,7 @@ public interface UserFeignClient { /** * 流动党员报到 + * * @param dto * @return */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index e4fb43921..dc9fd99f6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -176,6 +176,11 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO); } + @Override + public Result npmNeedCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "npmNeedCachingUserInfo", formDTO); + } + @Override public Result needCachingUserInfoByUserId(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfoByUserId", userId); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index a59d34023..531513a5e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -133,7 +133,7 @@ public class AppUserServiceImpl implements AppUserService { @Override public Result getNMPToken(EpdcAppUserTokenFormDTO formDto) { - return this.getTokenByOpenId(this.getNMPWxUser(formDto.getWxCode())); + return this.getNPMTokenByOpenId(this.getNMPWxUser(formDto.getWxCode())); } @@ -251,6 +251,19 @@ public class AppUserServiceImpl implements AppUserService { return this.getTokenByUserDto(userInfoResult.getData()); } + private Result getNPMTokenByOpenId(WxMaJscode2SessionResult wxMaJscode2SessionResult) { + // 查询当前微信是否已注册用户 + EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO(); + formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid()); + formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid()); + Result userInfoResult = userFeignClient.npmNeedCachingUserInfo(formDTO); + if (!userInfoResult.success()) { + return new Result().error(userInfoResult.getMsg()); + } + return this.getTokenByUserDto(userInfoResult.getData()); + } + + /** * 用户登录 * diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java index 3501688c5..07af3bd24 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/EpdcAppUserController.java @@ -432,6 +432,11 @@ public class EpdcAppUserController { return userService.queryCachingUserInfo(formDTO); } + @PostMapping("npmNeedCachingUserInfo") + public Result npmNeedCachingUserInfo(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) { + return userService.queryNpmCachingUserInfo(formDTO); + } + /** * 根据用户ID获取用户缓存信息 * diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java index c593e6119..f48b6490e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java @@ -202,6 +202,8 @@ public interface UserDao extends BaseDao { **/ CachingUserInfoDTO selectCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId); + CachingUserInfoDTO selectNpmCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId); + /** * @param userId * @return CachingUserInfoDTO diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java index ad7704033..a1b3efe95 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java @@ -352,6 +352,9 @@ public interface UserService extends BaseService { **/ Result queryCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + + Result queryNpmCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + /** * @return com.elink.esua.epdc.commons.tools.utils.Result * @Author yinzuomei diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java index 5afc5cfaa..455d5e547 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java @@ -513,7 +513,7 @@ public class UserServiceImpl extends BaseServiceImpl implem if (StringUtils.isNotBlank(identityNo)) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo); - wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId()); + wrapper.ne(formDto.getUserId() != null, FieldConstant.ID, formDto.getUserId()); Integer count = this.baseDao.selectCount(wrapper); if (count > NumConstant.ZERO) { return new Result().error("身份证号已被注册"); @@ -1365,6 +1365,14 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(cachingUserInfoDTO); } + @Override + public Result queryNpmCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOpenId())) { + throw new RenException("openId不能为空"); + } + return new Result().ok(baseDao.selectNpmCachingUserInfoDTO(formDTO.getOpenId(), formDTO.getUnionId())); + } + /** * @return com.elink.esua.epdc.commons.tools.utils.Result * @Author yinzuomei @@ -2097,8 +2105,8 @@ public class UserServiceImpl extends BaseServiceImpl implem entity1.setGridId(parentAndAllDeptDTOResult.getData().getGridId()); entity1.setGrid(parentAndAllDeptDTOResult.getData().getGrid()); LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.eq(UserGridRelationEntity::getUserId,entity.getId()); - userGridRelationService.update(entity1,updateWrapper); + updateWrapper.eq(UserGridRelationEntity::getUserId, entity.getId()); + userGridRelationService.update(entity1, updateWrapper); return new Result().ok("修改成功"); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 8874ca7d8..d374682ef 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -499,6 +499,45 @@ limit 1 + +