lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改注册接口-1.保存pc端sys_user和sys_user_role

Browse Source
This commit is contained in:
sh
2025-10-21 14:49:58 +08:00
parent 44ec48c49d
commit a6b5c06e63
27 changed files with 147 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@@ -4,7 +4,7 @@ import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.service.ICompanyService;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.cms.controller.app;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.CompanyCard;
import com.ruoyi.cms.domain.query.LabelQuery;
import com.ruoyi.cms.mapper.CompanyCardMapper;

10
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.cms.controller.app;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.JobFair;
import com.ruoyi.cms.domain.query.MineJobQuery;
@@ -9,6 +9,7 @@ import com.ruoyi.cms.service.*;
import com.ruoyi.common.annotation.BussinessLog;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SiteSecurityUtils;
import io.swagger.annotations.Api;
@@ -48,10 +49,11 @@ public class AppUserController extends BaseController
@ApiOperation("保存简历")
@PostMapping("/resume")
@BussinessLog(title = "保存简历")
public AjaxResult saveResume(@RequestBody AppUser appUser)
public AjaxResult saveResume(@RequestBody RegisterBody registerBody)
{
appUser.setUserId(SiteSecurityUtils.getUserId());
appUserService.updateAppUser(appUser);
/*appUser.setUserId(SiteSecurityUtils.getUserId());//AppUser appUser
appUserService.updateAppUser(appUser);*/
appUserService.registerAppUser(registerBody);
return AjaxResult.success();
}
@ApiOperation("查看简历")

4
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java
View File

@@ -1,8 +1,7 @@
package com.ruoyi.cms.controller.cms;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.cms.service.ICompanyCollectionService;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.service.ICompanyService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -12,7 +11,6 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.cms.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.entity.Company;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.dromara.easyes.annotation.IndexField;

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java
View File

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.Company;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java
View File

@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.entity.Company;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;

7
ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java
View File

@@ -2,7 +2,10 @@ package com.ruoyi.cms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.common.core.domain.entity.SysUser;
/**
* APP用户Mapper接口
@@ -22,4 +25,8 @@ public interface AppUserMapper extends BaseMapper<AppUser>
List<AppUser> selectByJobId(Long jobId);
AppUser selectByOpenid(String openid);
int insertSysUserRole(Map<String,Object> map);
int insertSysUser(SysUser sysUser);
}

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyCollectionMapper.java
View File

@@ -3,7 +3,7 @@ package com.ruoyi.cms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.CompanyCollection;
/**

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.cms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import org.apache.ibatis.annotations.Param;
/**

4
ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java
View File

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.RowWork;
import com.ruoyi.cms.domain.VectorJob;
import com.ruoyi.cms.domain.query.ESJobSearch;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.repository.query.Param;
/**
* 岗位Mapper接口

3
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.cms.service;
import java.util.List;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.common.core.domain.model.RegisterBody;
/**
* APP用户Service接口
@@ -54,4 +55,6 @@ public interface IAppUserService
public AppUser getPhone(String phone);
AppUser selectByOpenid(String openid);
public int registerAppUser(RegisterBody registerBody);
}

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyCollectionService.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.cms.service;
import java.util.List;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.CompanyCollection;
import com.ruoyi.cms.domain.Job;

4
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java
View File

@@ -1,11 +1,9 @@
package com.ruoyi.cms.service;
import java.util.HashMap;
import java.util.List;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.CompanyCard;
import com.ruoyi.cms.domain.query.LabelQuery;
import com.ruoyi.common.core.page.PageDomain;
/**
* 公司Service接口

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFairCollectionService.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.cms.service;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.cms.domain.FairCollection;
import com.ruoyi.cms.domain.JobFair;

71
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
View File

@@ -1,13 +1,19 @@
package com.ruoyi.cms.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Arrays;
import java.util.Map;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.cms.mapper.*;
import com.ruoyi.cms.util.StringUtil;
import com.ruoyi.common.core.domain.entity.JobTitle;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,6 +40,8 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
private UserWorkExperiencesMapper userWorkExperiencesMapper;
@Autowired
private AppSkillMapper appSkillMapper;
@Autowired
private CompanyMapper companyMapper;
/**
* 查询APP用户
*
@@ -93,20 +101,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
@Override
public int updateAppUser(AppUser appUser)
{
switch (appUser.getIsCompanyUser()){
case "0"://企业
if(appUser.getContactsList()!=null){
companyContactMapper.batchInsert(appUser.getContactsList());
}
break;
default://求职者
if(appUser.getExperiencesList()!=null){
userWorkExperiencesMapper.batchInsert(appUser.getExperiencesList());
}
if(appUser.getAppSkillsList()!=null){
appSkillMapper.batchInsert(appUser.getAppSkillsList());
}
}
return appUserMapper.updateById(appUser);
}
@@ -132,4 +126,53 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
public AppUser selectByOpenid(String openid) {
return appUserMapper.selectByOpenid(openid);
}
@Override
public int registerAppUser(RegisterBody registerBody) {
AppUser appUser=registerBody.getAppUser();
appUser.setUserId(SiteSecurityUtils.getUserId());
//角色集合
Map mapUserRole=new HashMap<>();
switch (appUser.getIsCompanyUser()){
case "0"://企业
if(registerBody.getCompany()!=null){
Long companyId=registerBody.getCompany().getCompanyId();
if(companyId==null){
companyMapper.insert(registerBody.getCompany());
registerBody.getCompany().getCompanyContactList().forEach(it->{
it.setCompanyId(registerBody.getCompany().getCompanyId());
});
}
if(registerBody.getCompany().getCompanyContactList()!=null){
companyContactMapper.batchInsert(registerBody.getCompany().getCompanyContactList());
}
}
mapUserRole.put("roleId",100);
break;
default://求职者
if(registerBody.getExperiencesList()!=null){
userWorkExperiencesMapper.batchInsert(registerBody.getExperiencesList());
}
if(registerBody.getAppSkillsList()!=null){
appSkillMapper.batchInsert(registerBody.getAppSkillsList());
}
mapUserRole.put("roleId",1);
}
//保存sys_user
SysUser sysUser=new SysUser();
sysUser.setUserId(appUser.getUserId());
sysUser.setUserName(appUser.getPhone());
sysUser.setNickName(appUser.getName());
sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
sysUser.setPhonenumber(appUser.getPhone());
sysUser.setSex(appUser.getSex());
sysUser.setStatus("0");
sysUser.setLoginIp(appUser.getLoginIp());
sysUser.setLoginDate(appUser.getLoginDate());
appUserMapper.insertSysUser(sysUser);
//保存sys_user_role
mapUserRole.put("userId",appUser.getUserId());
appUserMapper.insertSysUserRole(mapUserRole);
return appUserMapper.updateById(appUser);
}
}

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java
View File

@@ -5,7 +5,7 @@ import java.util.Arrays;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.mapper.JobMapper;
import com.ruoyi.common.utils.SiteSecurityUtils;

3
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.ruoyi.cms.domain.*;
import com.ruoyi.cms.domain.query.LabelQuery;
import com.ruoyi.cms.mapper.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.core.domain.entity.CompanyContact;
import com.ruoyi.common.core.domain.model.LoginSiteUser;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -34,7 +35,7 @@ import com.ruoyi.cms.service.ICompanyService;
* @date 2024-09-04
*/
@Service
public class CompanyServiceImpl extends ServiceImpl<CompanyMapper,Company> implements ICompanyService
public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements ICompanyService
{
@Autowired
private CompanyMapper companyMapper;

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FairCollectionServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.cms.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.cms.domain.FairCollection;
import com.ruoyi.cms.domain.JobFair;
import com.ruoyi.cms.mapper.FairCollectionMapper;

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.ruoyi.cms.mapper.CompanyMapper;
import com.ruoyi.cms.mapper.FairCollectionMapper;
import com.ruoyi.cms.mapper.FairCompanyMapper;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;

1
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.ruoyi.cms.service.*;
import com.ruoyi.cms.util.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.core.domain.entity.JobTitle;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;

37
ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
View File

@@ -66,4 +66,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectByOpenid" resultType="com.ruoyi.common.core.domain.entity.AppUser">
SELECT * FROM app_user WHERE DEL_FLAG = '0' and openid=#{openid} LIMIT 1
</select>
<insert id="insertSysUserRole" parameterType="java.util.Map">
insert into sys_user_role (user_id,role_id) values (#{userId},#{roleId})
</insert>
<insert id="insertSysUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="email != null and email != ''">email,</if>
<if test="avatar != null and avatar != ''">avatar,</if>
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
<if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
sysdate()
)
</insert>
</mapper>

2
ruoyi-bussiness/src/main/resources/mapper/app/CompanyCollectionMapper.xml
View File

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null "> and user_id = #{userId}</if>
</where>
</select>
<select id="collectionJob" resultType="com.ruoyi.cms.domain.Company">
<select id="collectionJob" resultType="com.ruoyi.common.core.domain.entity.Company">
select *
from company
where del_flag = '0'

2
ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml
View File

@@ -194,7 +194,7 @@
Collect_time, ClearFlag, Province, City, County, importdate, YearMonth,
IsRepeat, latitude, longitude,Std_class as JobCategory from row_work
</select>
<select id="selectRowCompany" resultType="com.ruoyi.cms.domain.Company">
<select id="selectRowCompany" resultType="com.ruoyi.common.core.domain.entity.Company">
SELECT *
FROM (
SELECT

12
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
View File

@@ -127,16 +127,4 @@ public class AppUser extends BaseEntity
@ApiModelProperty("民族")
private String nation;
@TableField(exist = false)
@ApiModelProperty("工作经历列表")
private List<UserWorkExperiences> experiencesList;
@TableField(exist = false)
@ApiModelProperty("公司联系人列表")
private List<CompanyContact> contactsList;
@TableField(exist = false)
@ApiModelProperty("技能列表")
private List<AppSkill> appSkillsList;
}

3
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.cms.domain;
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.entity.CompanyContact;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;

18
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
View File

@@ -1,11 +1,29 @@
package com.ruoyi.common.core.domain.model;
import com.ruoyi.common.core.domain.entity.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 用户注册对象
*
* @author ruoyi
*/
@Data
public class RegisterBody extends LoginBody
{
@ApiModelProperty("工作经历列表")
private List<UserWorkExperiences> experiencesList;
@ApiModelProperty("技能列表")
private List<AppSkill> appSkillsList;
@ApiModelProperty("公司信息")
private Company company;
@ApiModelProperty("用户信息")
private AppUser appUser;
}