From a6b5c06e63811c85e35f0bbed4fefda36913e540 Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 21 Oct 2025 14:49:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3-1.=E4=BF=9D=E5=AD=98pc=E7=AB=AFsys=5Fuser=E5=92=8Csys?= =?UTF-8?q?=5Fuser=5Frole?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 2 +- .../controller/app/AppCompanyController.java | 2 +- .../cms/controller/app/AppUserController.java | 10 +-- .../cms/controller/cms/CompanyController.java | 4 +- .../com/ruoyi/cms/domain/ESJobDocument.java | 1 + .../main/java/com/ruoyi/cms/domain/Job.java | 1 + .../java/com/ruoyi/cms/domain/JobFair.java | 1 + .../com/ruoyi/cms/mapper/AppUserMapper.java | 7 ++ .../cms/mapper/CompanyCollectionMapper.java | 2 +- .../com/ruoyi/cms/mapper/CompanyMapper.java | 2 +- .../java/com/ruoyi/cms/mapper/JobMapper.java | 4 +- .../ruoyi/cms/service/IAppUserService.java | 3 + .../service/ICompanyCollectionService.java | 2 +- .../ruoyi/cms/service/ICompanyService.java | 4 +- .../cms/service/IFairCollectionService.java | 1 - .../cms/service/impl/AppUserServiceImpl.java | 71 +++++++++++++++---- .../impl/CompanyCollectionServiceImpl.java | 2 +- .../cms/service/impl/CompanyServiceImpl.java | 3 +- .../impl/FairCollectionServiceImpl.java | 1 - .../cms/service/impl/JobFairServiceImpl.java | 1 + .../cms/service/impl/JobServiceImpl.java | 1 + .../resources/mapper/app/AppUserMapper.xml | 37 ++++++++++ .../mapper/app/CompanyCollectionMapper.xml | 2 +- .../main/resources/mapper/app/JobMapper.xml | 2 +- .../common/core/domain/entity/AppUser.java | 12 ---- .../common/core/domain/entity}/Company.java | 3 +- .../core/domain/model/RegisterBody.java | 18 +++++ 27 files changed, 147 insertions(+), 52 deletions(-) rename {ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain => ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity}/Company.java (97%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 2cd27d5..c267953 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java index dc0f678..b726c81 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java index b9f650c..b7c4976 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java @@ -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("查看简历") diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java index 5e6fa82..58574f8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java @@ -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.*; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java index 7fed79f..fe63a98 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 5910510..ed58037 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java index 66bbc85..3f18333 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobFair.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java index 213bf58..229d4bb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java @@ -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 List selectByJobId(Long jobId); AppUser selectByOpenid(String openid); + + int insertSysUserRole(Map map); + + int insertSysUser(SysUser sysUser); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyCollectionMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyCollectionMapper.java index 6dc96b5..59f1e5d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyCollectionMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyCollectionMapper.java @@ -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; /** diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java index f22afbf..b21e1e9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyMapper.java @@ -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; /** diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java index 6bb8772..d6cc804 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobMapper.java @@ -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接口 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java index 86a208d..997e078 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java @@ -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); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyCollectionService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyCollectionService.java index d5a55b6..839ad93 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyCollectionService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyCollectionService.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java index ab77524..a8ee6be 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyService.java @@ -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接口 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFairCollectionService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFairCollectionService.java index b9f81da..31a7fd7 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFairCollectionService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFairCollectionService.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index c5c2b9c..ec2edd6 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -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 imple private UserWorkExperiencesMapper userWorkExperiencesMapper; @Autowired private AppSkillMapper appSkillMapper; + @Autowired + private CompanyMapper companyMapper; /** * 查询APP用户 * @@ -93,20 +101,6 @@ public class AppUserServiceImpl extends ServiceImpl 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 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); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java index 94d6b84..657891c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java index c0748b3..30faee2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java @@ -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 implements ICompanyService +public class CompanyServiceImpl extends ServiceImpl implements ICompanyService { @Autowired private CompanyMapper companyMapper; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FairCollectionServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FairCollectionServiceImpl.java index f0d0fae..627a1fd 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FairCollectionServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FairCollectionServiceImpl.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java index 748634a..2e83d78 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java @@ -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; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index 17ea466..e477153 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -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; diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml index 31d6f58..35e6c74 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml @@ -66,4 +66,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + insert into sys_user_role (user_id,role_id) values (#{userId},#{roleId}) + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + \ No newline at end of file diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyCollectionMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyCollectionMapper.xml index 8f597f5..47f145e 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyCollectionMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyCollectionMapper.xml @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and user_id = #{userId} - select * from company where del_flag = '0' diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index 3559467..9136b3c 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -194,7 +194,7 @@ Collect_time, ClearFlag, Province, City, County, importdate, YearMonth, IsRepeat, latitude, longitude,Std_class as JobCategory from row_work - SELECT * FROM ( SELECT diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index c5ee15b..2317024 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -127,16 +127,4 @@ public class AppUser extends BaseEntity @ApiModelProperty("民族") private String nation; - - @TableField(exist = false) - @ApiModelProperty("工作经历列表") - private List experiencesList; - - @TableField(exist = false) - @ApiModelProperty("公司联系人列表") - private List contactsList; - - @TableField(exist = false) - @ApiModelProperty("技能列表") - private List appSkillsList; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java similarity index 97% rename from ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java index 30a0164..e496b61 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Company.java @@ -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; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java index 868a1fc..3996efc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java @@ -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 experiencesList; + + @ApiModelProperty("技能列表") + private List appSkillsList; + + @ApiModelProperty("公司信息") + private Company company; + + @ApiModelProperty("用户信息") + private AppUser appUser; }