From 72ebcefef77b0ff76c1dd4043cf86c7323c1a482 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Mon, 16 Jun 2025 09:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86hcp=E7=99=BB?= =?UTF-8?q?=E5=BD=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caseData/controller/PublicController.java | 2 +- .../example/caseData/service/UserService.java | 95 +++---------------- 2 files changed, 12 insertions(+), 85 deletions(-) diff --git a/src/main/java/com/example/caseData/controller/PublicController.java b/src/main/java/com/example/caseData/controller/PublicController.java index f7945a7..f9cfd05 100644 --- a/src/main/java/com/example/caseData/controller/PublicController.java +++ b/src/main/java/com/example/caseData/controller/PublicController.java @@ -50,7 +50,7 @@ public class PublicController { @PostMapping("/login/hcp") public Response loginHcp(@Validated() @ModelAttribute LoginHcpRequest request) { // 用户登陆 - LoginDto g = userService.UserLoginWithAppToken(request.getToken()); + LoginDto g = userService.UserLoginWithApp(request.getToken()); return Response.success(g); } diff --git a/src/main/java/com/example/caseData/service/UserService.java b/src/main/java/com/example/caseData/service/UserService.java index 5585371..878a394 100644 --- a/src/main/java/com/example/caseData/service/UserService.java +++ b/src/main/java/com/example/caseData/service/UserService.java @@ -52,7 +52,8 @@ public class UserService { @Transactional public LoginDto UserLoginWithMobile(String phone) throws BusinessException { // 获取app用户数据 - UserModel user = GetAppUserInfoByPhone(phone); + GetUserInfoResponse result = userInfo.getUserInfoByMobile(phone); + UserModel user = GetAppUserInfo(result); // 生成jwt String token = jwtUtil.createToken(String.valueOf(user.getUserId())); @@ -76,15 +77,13 @@ public class UserService { } /** - * 用户登陆-appToken + * 用户登陆-app * @param appToken 1 - * @return - * @throws BusinessException */ @Transactional - public LoginDto UserLoginWithAppToken(String appToken) throws BusinessException { - // 获取app用户数据 - UserModel user = GetAppUserInfoByToken(appToken); + public LoginDto UserLoginWithApp(String appToken) throws BusinessException { + GetUserInfoResponse result = userInfo.getUserInfoByToken(appToken); + UserModel user = GetAppUserInfo(result); // 生成jwt String token = jwtUtil.createToken(String.valueOf(user.getUserId())); @@ -107,89 +106,17 @@ public class UserService { return g; } + /** - * 获取app用户数据-手机号 - * @param phone 手机号 + * 获取app用户数据 * @return UserModel */ - public UserModel GetAppUserInfoByPhone(String phone) throws BusinessException { - // 请求接口获取数据 - GetUserInfoResponse result = userInfo.getUserInfoByMobile(phone); - GetUserInfoResponse.ResponsData data = result.getData(); + public UserModel GetAppUserInfo(GetUserInfoResponse r) throws BusinessException { + GetUserInfoResponse.ResponsData data = r.getData(); // 查询数据库用户信息 LambdaQueryWrapper userModelWrapper = new LambdaQueryWrapper<>(); - userModelWrapper.eq(UserModel::getUserIden, result.getData().getUuid()); - UserModel user = userDao.selectOne(userModelWrapper); - if (user == null){ - // 构造 UserModel 对象 - user = new UserModel(); - user.setUserIden(data.getUuid()); - user.setUserName(data.getRealname()); - user.setUserMobile(data.getMobile()); - user.setMobileEncryption(SecureUtil.md5(data.getMobile())); - user.setStatus(1); - user.setRegisterSource(2); - user.setOpenId(""); - user.setUnionId(""); - user.setSex(0); - user.setAvatar(data.getPhoto()); - user.setDepartmentName(data.getOfficeName()); - user.setTitle(StringToInt.DoctorTitleToInt(data.getPositionName())); - user.setAddress(data.getProvName()); - save(user); - }else{ - if (!Objects.equals(user.getUserName(), data.getRealname())){ - user.setUserName(data.getRealname()); - } - - if (!Objects.equals(user.getUserMobile(), data.getMobile())){ - user.setUserMobile(data.getMobile()); - user.setMobileEncryption(SecureUtil.md5(data.getMobile())); - } - - if (!Objects.equals(user.getTitle(), StringToInt.DoctorTitleToInt(data.getOfficeName()))){ - user.setTitle(StringToInt.DoctorTitleToInt(data.getOfficeName())); - } - - if (!Objects.equals(user.getDepartmentName(), data.getOfficeName())){ - user.setDepartmentName(data.getOfficeName()); - } - - if (!Objects.equals(user.getAddress(), data.getProvName())){ - user.setAddress(data.getProvName()); - } - - userDao.updateById(user); - } - - // 获取app医院数据 - BasicHospitalModel basicHospital = GetAppHospital(data.getHospitalUuid()); - - // 修改用户所属医院 - if (!Objects.equals(user.getHospitalId(), basicHospital.getHospitalId())){ - UserModel updateUser = new UserModel(); - updateUser.setUserId(user.getUserId()); - updateUser.setHospitalId(basicHospital.getHospitalId()); - userDao.updateById(updateUser); - } - - return user; - } - - /** - * 获取app用户数据-token - * @param token token - * @return UserModel - */ - public UserModel GetAppUserInfoByToken(String token) throws BusinessException { - // 请求接口获取数据 - GetUserInfoResponse result = userInfo.getUserInfoByToken(token); - GetUserInfoResponse.ResponsData data = result.getData(); - - // 查询数据库用户信息 - LambdaQueryWrapper userModelWrapper = new LambdaQueryWrapper<>(); - userModelWrapper.eq(UserModel::getUserIden, result.getData().getUuid()); + userModelWrapper.eq(UserModel::getUserIden, r.getData().getUuid()); UserModel user = userDao.selectOne(userModelWrapper); if (user == null){ // 构造 UserModel 对象