From c967e9b6086059b1dab5323ecaf136bce92d7809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Mon, 17 Feb 2025 11:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/common/AppLoginController.java | 6 +++++- .../web/controller/wgz/controller/WgzAppController.java | 9 ++++----- .../framework/web/service/AppUserDetailsServiceImpl.java | 9 ++++++++- .../ruoyi/wgz/bo/req/WgzRealNameAuthenticationReq.java | 4 ++++ .../main/java/com/ruoyi/wgz/service/IWgzUserService.java | 9 +++++++++ 5 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzRealNameAuthenticationReq.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppLoginController.java index 1c3d485..81cf48c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppLoginController.java @@ -12,6 +12,7 @@ import com.ruoyi.framework.web.service.AppLoginService; import com.ruoyi.framework.web.service.SysPermissionService; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.service.ISysMenuService; +import com.ruoyi.wgz.service.IWgzUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -44,6 +45,9 @@ public class AppLoginController @Autowired private IBgtUserService iBgtUserService; + @Autowired + private IWgzUserService wgzUserService; + /** * 登录方法 * @@ -79,7 +83,7 @@ public class AppLoginController ajax.put("user", bgtUser); break; case Constants.WGZ: - ajax.put("user", user); + ajax.put("user", wgzUserService.userLongIn(user.getPhonenumber())); break; default: break; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java index 0786e00..760d48e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq; import com.ruoyi.wgz.bo.req.WgzAppUserLongInReq; import com.ruoyi.wgz.bo.req.WgzAppUserRegisterReq; +import com.ruoyi.wgz.bo.req.WgzRealNameAuthenticationReq; import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes; import com.ruoyi.wgz.bo.res.WgzAppUserLongInRes; import com.ruoyi.wgz.service.IWgzUserService; @@ -14,9 +15,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * APP务工者Controller @@ -49,7 +48,7 @@ public class WgzAppController { */ @ApiOperation("APP务工者-个人基本信息") @PreAuthorize("@ss.hasPermi('wgzApp:user:userPersonalBasicInformation')") - @PostMapping("/wgzPersonalBasicInformation") + @GetMapping("/wgzPersonalBasicInformation") public AjaxResult userPersonalBasicInformation(@Validated WgzAppPersonalBasicInformationReq req) { return AjaxResult.success(iWgzUserService.userPersonalBasicInformation(req)); } @@ -60,7 +59,7 @@ public class WgzAppController { // @ApiOperation("APP务工者-实名认证") // @PreAuthorize("@ss.hasPermi('wgzApp:user:userRealNameAuthentication')") // @PostMapping("/wgzUserRealNameAuthentication") -// public AjaxResult userRealNameAuthentication(@Validated WgzAppPersonalBasicInformationReq req) { +// public AjaxResult userRealNameAuthentication(@Validated @RequestBody WgzRealNameAuthenticationReq req) { // return AjaxResult.success(iWgzUserService.userPersonalBasicInformation(req)); // } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AppUserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AppUserDetailsServiceImpl.java index 50b34a7..316c771 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AppUserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/AppUserDetailsServiceImpl.java @@ -11,6 +11,8 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.UserStatus; import com.ruoyi.common.exception.BaseException; +import com.ruoyi.wgz.domain.WgzUser; +import com.ruoyi.wgz.service.IWgzUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +33,9 @@ public class AppUserDetailsServiceImpl implements UserDetailsService { private static final Logger log = LoggerFactory.getLogger(AppUserDetailsServiceImpl.class); + @Autowired + private IWgzUserService wgzUserService; + @Autowired private IBgtUserService userService; @@ -46,7 +51,9 @@ public class AppUserDetailsServiceImpl implements UserDetailsService check(user,phone); userDetailsl = createLoginUser(user,Constants.BGT); } else if (phone.contains(Constants.WGZ)) { - + WgzUser wgzUser = wgzUserService.userLongIn(phone.replace(Constants.WGZ, "")); + check(wgzUser,phone); + userDetailsl = createLoginUser(wgzUser,Constants.WGZ); } return userDetailsl; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzRealNameAuthenticationReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzRealNameAuthenticationReq.java new file mode 100644 index 0000000..2d98b98 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzRealNameAuthenticationReq.java @@ -0,0 +1,4 @@ +package com.ruoyi.wgz.bo.req; + +public class WgzRealNameAuthenticationReq { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java index ff11407..ebff4bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzUserService.java @@ -5,8 +5,10 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.wgz.bo.WgzUserQueryBo; import com.ruoyi.wgz.bo.req.WgzAppPersonalBasicInformationReq; import com.ruoyi.wgz.bo.req.WgzAppUserRegisterReq; +import com.ruoyi.wgz.bo.req.WgzRealNameAuthenticationReq; import com.ruoyi.wgz.bo.res.WgzAppPersonalBasicInformationRes; import com.ruoyi.wgz.domain.WgzUser; +import org.springframework.validation.annotation.Validated; import java.util.Collection; import java.util.List; @@ -84,4 +86,11 @@ public interface IWgzUserService extends IServicePlus { * @return bool */ WgzAppPersonalBasicInformationRes userPersonalBasicInformation(WgzAppPersonalBasicInformationReq req); + +// /** +// * 务工者APP实名认证 +// * @param req APP务工者实名认证业务对象 +// * @return bool +// */ +// Boolean userRealNameAuthentication(WgzRealNameAuthenticationReq req); }