diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index 239c426..23a2321 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -3,6 +3,7 @@ package com.ruoyi.cms.controller.cms; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.cms.domain.vo.AppUserLky; import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.common.annotation.BussinessLog; import com.ruoyi.common.core.domain.model.RegisterBody; @@ -171,4 +172,19 @@ public class CmsAppUserController extends BaseController AppUser appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); return AjaxResult.success(appUserService.getMyTj(appUser.getUserId())); } + + @ApiOperation("返回求职者劳科院-当前职位名称、技能标签") + @GetMapping("/appUserInfo") + public AjaxResult appUserInfo(AppUser appUser) + { + if(!SecurityUtils.isLogin()){ + return AjaxResult.error("未登录!"); + } + if(StringUtils.isEmpty(RoleUtils.getCurrentUseridCard())){ + return AjaxResult.error("用户信息为空!"); + } + appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser); + return AjaxResult.success(appUserLky); + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/tymh/wwToken/WwTyInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/tymh/wwToken/WwTyInfo.java index 8fc1ebc..6fa8e07 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/tymh/wwToken/WwTyInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/tymh/wwToken/WwTyInfo.java @@ -19,4 +19,6 @@ public class WwTyInfo { private String idno; @ApiModelProperty("个人姓名") private String name; + @ApiModelProperty("手机号") + private String phone; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java index d036b2e..e0dd48d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java @@ -1,10 +1,12 @@ package com.ruoyi.framework.web.service; import com.ruoyi.cms.service.CompanyContactService; +import com.ruoyi.cms.service.IAppUserService; import com.ruoyi.cms.service.ICompanyService; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.cms.util.oauth.OauthClient; import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.Company; import com.ruoyi.common.core.domain.entity.CompanyContact; import com.ruoyi.common.core.domain.entity.SysUser; @@ -54,6 +56,8 @@ public class OauthLoginHlwService { private ICompanyService companyService; @Autowired private CompanyContactService companyContactService; + @Autowired + private IAppUserService appUserService; // Redis缓存:门户UserID → 若依本地用户名(避免重复匹配数据库) private static final String REDIS_KEY_PORTAL_USER_MAPPING = "hlw:user:mapping:"; @@ -143,6 +147,10 @@ public class OauthLoginHlwService { * 自动创建本地用户 */ private SysUser createLocalUser(WwTyInfo wwTyInfo) { + //移动端用户 + AppUser appUserParm=new AppUser(); + appUserParm.setIsRecommend(1); + //pc端 SysUser newUser = new SysUser(); String localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno(); switch (wwTyInfo.getUsertype()) { @@ -150,6 +158,10 @@ public class OauthLoginHlwService { newUser.setNickName(wwTyInfo.getName()); newUser.setIdCard(wwTyInfo.getIdno()); newUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QZZ)}); + //移动端 + appUserParm.setPhone(wwTyInfo.getPhone()); + appUserParm.setIdCard(wwTyInfo.getIdno()); + appUserParm.setName(wwTyInfo.getName()); break; default://单位 newUser.setNickName(wwTyInfo.getEnterprisename()); @@ -164,11 +176,23 @@ public class OauthLoginHlwService { companyContact.setCompanyId(company.getCompanyId()); companyContactService.insertContact(companyContact); } + //移动端 + appUserParm.setPhone(wwTyInfo.getPhone()); + appUserParm.setIdCard(wwTyInfo.getEnterprisecode()); + appUserParm.setName(wwTyInfo.getEnterprisename()); } newUser.setPassword(SecurityUtils.encryptPassword("123456")); newUser.setDelFlag("0"); newUser.setUserName(localUsername); sysUserService.insertUser(newUser); + //插入app_user + AppUser appUser=appUserService.selectAppuserByIdcard(wwTyInfo.getIdno()); + if(appUser!=null){ + appUserParm.setUserId(appUser.getUserId()); + appUserService.updateAppUser(appUserParm); + }else{ + appUserService.insertAppUser(appUserParm); + } return newUser; } @@ -249,6 +273,10 @@ public class OauthLoginHlwService { * @param wwTyInfo */ private void updateUserInfo(WwTyInfo wwTyInfo){ + //移动端用户 + AppUser appUserParm=new AppUser(); + appUserParm.setIsRecommend(1); + //pc端 String localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno(); SysUser sysUser=new SysUser(); switch (wwTyInfo.getUsertype()){ @@ -256,6 +284,10 @@ public class OauthLoginHlwService { sysUser.setNickName(wwTyInfo.getName()); sysUser.setIdCard(wwTyInfo.getIdno()); sysUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QZZ)}); + //移动端 + appUserParm.setPhone(wwTyInfo.getPhone()); + appUserParm.setIdCard(wwTyInfo.getIdno()); + appUserParm.setName(wwTyInfo.getName()); break; default: sysUser.setNickName(wwTyInfo.getEnterprisename()); @@ -263,6 +295,10 @@ public class OauthLoginHlwService { sysUser.setRoleIds(new Long[]{parseStringToLoing(StringUtil.SYS_QY)}); //企业联系人->现根据社会信用代码查询企业信息 updateCompanyContact(wwTyInfo); + //移动端 + appUserParm.setPhone(wwTyInfo.getPhone()); + appUserParm.setIdCard(wwTyInfo.getEnterprisecode()); + appUserParm.setName(wwTyInfo.getEnterprisename()); } //查询用户角色 sysUser.setUserName(localUsername); @@ -270,6 +306,14 @@ public class OauthLoginHlwService { SysUser parmUser=sysUserService.selectUserByUserName(localUsername); sysUser.setUserId(parmUser.getUserId()); sysUserService.updateUser(sysUser); + //插入app_user + AppUser appUser=appUserService.selectAppuserByIdcard(wwTyInfo.getIdno()); + if(appUser!=null){ + appUserParm.setUserId(appUser.getUserId()); + appUserService.updateAppUser(appUserParm); + }else{ + appUserService.insertAppUser(appUserParm); + } } /**