From 44ec48c49d24b6411d72457aa4c6477e28a61b94 Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 21 Oct 2025 13:01:34 +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=98=E4=BC=81=E4=B8=9A=E8=81=94?= =?UTF-8?q?=E7=B3=BB2.=E4=BF=9D=E5=AD=98=E5=B7=A5=E4=BD=9C=E7=BB=8F?= =?UTF-8?q?=E5=8E=86=E5=92=8C=E7=94=A8=E6=88=B7=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSkillController.java | 81 +++++++++++++++++++ .../app/AppUserWorkExperiencesController.java | 2 +- .../cms/CompanyContactController.java | 2 +- .../cms/UserWorkExperiencesController.java | 2 +- .../java/com/ruoyi/cms/domain/Company.java | 1 + .../com/ruoyi/cms/mapper/AppSkillMapper.java | 20 +++++ .../cms/mapper/CompanyContactMapper.java | 4 +- .../cms/mapper/UserWorkExperiencesMapper.java | 4 +- .../ruoyi/cms/service/AppSkillService.java | 26 ++++++ .../cms/service/CompanyContactService.java | 2 +- .../service/UserWorkExperiencesService.java | 2 +- .../cms/service/impl/AppSkillServiceImpl.java | 43 ++++++++++ .../cms/service/impl/AppUserServiceImpl.java | 23 +++++- .../impl/CompanyContactServiceImpl.java | 2 +- .../cms/service/impl/CompanyServiceImpl.java | 1 + .../impl/UserWorkExperiencesServiceImpl.java | 2 +- .../java/com/ruoyi/cms/util/WechatUtil.java | 4 +- .../resources/mapper/app/AppSkillMapper.xml | 45 +++++++++++ .../mapper/app/CompanyContactMapper.xml | 13 +++ .../mapper/app/UserWorkExperiencesMapper.xml | 13 +++ .../common/core/domain/entity/AppSkill.java | 46 +++++++++++ .../common/core/domain/entity/AppUser.java | 12 +++ .../core/domain/entity}/CompanyContact.java | 2 +- .../domain/entity}/UserWorkExperiences.java | 2 +- .../web/service/SysLoginService.java | 2 + 25 files changed, 341 insertions(+), 15 deletions(-) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppSkillMapper.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppSkillService.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppSkillServiceImpl.java create mode 100644 ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java rename {ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain => ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity}/CompanyContact.java (95%) rename {ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain => ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity}/UserWorkExperiences.java (96%) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java new file mode 100644 index 0000000..f4ea8b2 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppSkillController.java @@ -0,0 +1,81 @@ +package com.ruoyi.cms.controller.app; + + +import com.ruoyi.cms.service.AppSkillService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.AppSkill; +import com.ruoyi.common.core.page.TableDataInfo; +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.web.bind.annotation.*; + + +import java.util.List; + + +/** + * 用户技能信息 + * + * @author + * @email + * @date 2025-10-21 12:22:09 + */ +@RestController +@RequestMapping("/appskill/list") +@Api(tags = "移动端:用户技能") +public class AppSkillController extends BaseController { + @Autowired + private AppSkillService appSkillService; + + /** + * 列表 + */ + @ApiOperation("获取工作经历详细信息") + @GetMapping("/list") + public TableDataInfo list(AppSkill appSkill){ + startPage(); + List list=appSkillService.getList(appSkill); + return getDataTable(list); + } + + + /** + * 信息 + */ + @ApiOperation("获取工作经历详细信息") + @GetMapping(value = "/{id}") + public AjaxResult info(@PathVariable("id") Long id){ + return success(appSkillService.getAppskillById(id)); + } + + /** + * 保存 + */ + @ApiOperation("获取工作经历详细信息") + @PostMapping("/add") + public AjaxResult save(@RequestBody AppSkill appSkill){ + return toAjax(appSkillService.insertAppskill(appSkill)); + } + + /** + * 修改 + */ + @ApiOperation("获取工作经历详细信息") + @PutMapping("/edit") + public AjaxResult update(@RequestBody AppSkill appSkill){ + return toAjax(appSkillService.updateAppskillById(appSkill)); + } + + /** + * 删除 + */ + @ApiOperation("获取工作经历详细信息") + @DeleteMapping("/{id}") + public AjaxResult delete(@ApiParam("主键id") @PathVariable Long id){ + return toAjax(appSkillService.removeAppskillIds(new Long[]{id})); + } + +} diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java index 79b32c3..4978138 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.controller.app; -import com.ruoyi.cms.domain.UserWorkExperiences; +import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import com.ruoyi.cms.service.UserWorkExperiencesService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyContactController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyContactController.java index f6949b5..c3d55c9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyContactController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyContactController.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.controller.cms; -import com.ruoyi.cms.domain.CompanyContact; +import com.ruoyi.common.core.domain.entity.CompanyContact; import com.ruoyi.cms.service.CompanyContactService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java index babee3a..2f75a41 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.controller.cms; -import com.ruoyi.cms.domain.UserWorkExperiences; +import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import com.ruoyi.cms.service.UserWorkExperiencesService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java index bd9a88a..30a0164 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Company.java @@ -1,6 +1,7 @@ package com.ruoyi.cms.domain; 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-bussiness/src/main/java/com/ruoyi/cms/mapper/AppSkillMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppSkillMapper.java new file mode 100644 index 0000000..b1b411a --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppSkillMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.cms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.core.domain.entity.AppSkill; + +import java.util.List; + +/** + * 用户技能信息 + * + * @author + * @email + * @date 2025-10-21 12:22:09 + */ +public interface AppSkillMapper extends BaseMapper { + + List getList(AppSkill appSkill); + + int batchInsert(List list); +} diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyContactMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyContactMapper.java index c08f5f2..7508f65 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyContactMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyContactMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cms.domain.CompanyContact; +import com.ruoyi.common.core.domain.entity.CompanyContact; import java.util.List; @@ -15,4 +15,6 @@ import java.util.List; public interface CompanyContactMapper extends BaseMapper { List getSelectList(CompanyContact companyContact); + + int batchInsert(List list); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/UserWorkExperiencesMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/UserWorkExperiencesMapper.java index befeedc..b483ecd 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/UserWorkExperiencesMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/UserWorkExperiencesMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.cms.domain.UserWorkExperiences; +import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import java.util.List; @@ -15,4 +15,6 @@ import java.util.List; public interface UserWorkExperiencesMapper extends BaseMapper { List getWorkExperiencesList(UserWorkExperiences userWorkExperiences); + + int batchInsert(List list); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppSkillService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppSkillService.java new file mode 100644 index 0000000..147d004 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/AppSkillService.java @@ -0,0 +1,26 @@ +package com.ruoyi.cms.service; + +import com.ruoyi.common.core.domain.entity.AppSkill; + +import java.util.List; + +/** + * 用户技能信息 + * + * @author + * @email + * @date 2025-10-21 12:22:09 + */ +public interface AppSkillService{ + + List getList(AppSkill appSkill); + + int insertAppskill(AppSkill appSkill); + + int updateAppskillById(AppSkill appSkill); + + int removeAppskillIds(Long[] ids); + + AppSkill getAppskillById(Long id); +} + diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/CompanyContactService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/CompanyContactService.java index 9830129..a1d5f3c 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/CompanyContactService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/CompanyContactService.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.service; -import com.ruoyi.cms.domain.CompanyContact; +import com.ruoyi.common.core.domain.entity.CompanyContact; import java.util.List; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/UserWorkExperiencesService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/UserWorkExperiencesService.java index 9812c29..4b52e6e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/UserWorkExperiencesService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/UserWorkExperiencesService.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.service; -import com.ruoyi.cms.domain.UserWorkExperiences; +import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import java.util.List; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppSkillServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppSkillServiceImpl.java new file mode 100644 index 0000000..2dd3a65 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppSkillServiceImpl.java @@ -0,0 +1,43 @@ +package com.ruoyi.cms.service.impl; + +import com.ruoyi.cms.mapper.AppSkillMapper; +import com.ruoyi.cms.service.AppSkillService; +import com.ruoyi.common.core.domain.entity.AppSkill; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + + +@Service +public class AppSkillServiceImpl extends ServiceImpl implements AppSkillService { + + @Autowired + AppSkillMapper appSkillMapper; + + public List getList(AppSkill appSkill){ + return appSkillMapper.getList(appSkill); + } + + @Override + public int insertAppskill(AppSkill appSkill) { + return appSkillMapper.insert(appSkill); + } + + @Override + public int updateAppskillById(AppSkill appSkill) { + return appSkillMapper.updateById(appSkill); + } + + @Override + public int removeAppskillIds(Long[] ids) { + return appSkillMapper.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public AppSkill getAppskillById(Long id) { + return appSkillMapper.selectById(id); + } +} 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 a3f006e..c5c2b9c 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 @@ -5,14 +5,13 @@ import java.util.Arrays; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.cms.mapper.JobTitleMapper; +import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.core.domain.entity.JobTitle; import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import com.ruoyi.cms.mapper.AppUserMapper; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.cms.service.IAppUserService; @@ -29,6 +28,12 @@ public class AppUserServiceImpl extends ServiceImpl imple private AppUserMapper appUserMapper; @Autowired private JobTitleMapper jobTitleMapper; + @Autowired + private CompanyContactMapper companyContactMapper; + @Autowired + private UserWorkExperiencesMapper userWorkExperiencesMapper; + @Autowired + private AppSkillMapper appSkillMapper; /** * 查询APP用户 * @@ -88,6 +93,20 @@ 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); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyContactServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyContactServiceImpl.java index b2909a9..8768587 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyContactServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyContactServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.service.impl; -import com.ruoyi.cms.domain.CompanyContact; +import com.ruoyi.common.core.domain.entity.CompanyContact; import com.ruoyi.cms.mapper.CompanyContactMapper; import com.ruoyi.cms.service.CompanyContactService; import org.springframework.beans.factory.annotation.Autowired; 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 801116a..c0748b3 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.CompanyContact; import com.ruoyi.common.core.domain.model.LoginSiteUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.exception.ServiceException; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/UserWorkExperiencesServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/UserWorkExperiencesServiceImpl.java index feef848..7813f95 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/UserWorkExperiencesServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/UserWorkExperiencesServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.cms.service.impl; -import com.ruoyi.cms.domain.UserWorkExperiences; +import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import com.ruoyi.cms.mapper.UserWorkExperiencesMapper; import com.ruoyi.cms.service.UserWorkExperiencesService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/WechatUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/WechatUtil.java index 02d0352..7d92d52 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/WechatUtil.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/WechatUtil.java @@ -28,8 +28,8 @@ public class WechatUtil { /** * 生成signature **/ - private static String appid = "wx9d1cbc11c8c40ba7"; - private static String secret = "38e87cf6251945446e8ac091a0ba9ab2"; + private static String appid = "wxee0d0655e464f184"; + private static String secret = "38a71cb90ea12c6b2eee4434ae7932cf"; public AppWechatEntity sign(String url) { Map ret = new HashMap(); String nonceStr = create_nonce_str(); diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml new file mode 100644 index 0000000..eb08ef3 --- /dev/null +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + select id, user_id, name, levels, del_flag, create_by, create_time, update_by, update_time, remark from app_skill + + + + + + INSERT INTO app_skill ( + user_id, name, levels, create_by, create_time, del_flag + ) VALUES + + ( + #{item.userId}, #{item.name}, #{item.levels}, + #{item.createBy}, #{item.createTime}, #{item.delFlag} + ) + + + + diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyContactMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyContactMapper.xml index 3c498b3..9b89186 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyContactMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyContactMapper.xml @@ -36,4 +36,17 @@ + + INSERT INTO company_contact ( + company_id, contact_person, contact_person_phone, + create_by, create_time, del_flag,remark + ) VALUES + + ( + #{item.companyId}, #{item.contactPerson}, #{item.contactPersonPhone}, + #{item.createBy}, #{item.createTime}, #{item.delFlag},#{item.remark} + ) + + + diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/UserWorkExperiencesMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/UserWorkExperiencesMapper.xml index c20534f..2c202c0 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/UserWorkExperiencesMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/UserWorkExperiencesMapper.xml @@ -35,4 +35,17 @@ + + INSERT INTO user_work_experiences ( + company_name, position, user_id, start_date, end_date, description, + create_by, create_time, del_flag,remark + ) VALUES + + ( + #{item.companyName}, #{item.position}, #{item.userId},#{item.startDate},#{item.endDate}, + #{item.description},#{item.createBy}, #{item.createTime}, #{item.delFlag},#{item.remark} + ) + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java new file mode 100644 index 0000000..cd260a9 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppSkill.java @@ -0,0 +1,46 @@ +package com.ruoyi.common.core.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 用户技能信息 + * + * @author + * @email + * @date 2025-10-21 12:22:09 + */ +@Data +@TableName("app_skill") +public class AppSkill extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "user_id",type = IdType.AUTO) + @ApiModelProperty("用户ID") + private Long id; + /** + * 用户id + */ + @ApiModelProperty("用户id") + private Long userId; + /** + * 技能名称 + */ + @ApiModelProperty("技能名称") + private String name; + /** + * 技能等级 + */ + @ApiModelProperty("技能等级") + private String levels; +} 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 2317024..c5ee15b 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,4 +127,16 @@ 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/CompanyContact.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/CompanyContact.java similarity index 95% rename from ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyContact.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/CompanyContact.java index 3ddbf52..7a9f301 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyContact.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/CompanyContact.java @@ -1,4 +1,4 @@ -package com.ruoyi.cms.domain; +package com.ruoyi.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/UserWorkExperiences.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java similarity index 96% rename from ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/UserWorkExperiences.java rename to ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java index 223b8af..d91c76b 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/UserWorkExperiences.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java @@ -1,4 +1,4 @@ -package com.ruoyi.cms.domain; +package com.ruoyi.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index fbbed68..91aa519 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -258,6 +258,7 @@ public class SysLoginService if(existingUser!=null){ String token = loginUserIdApp(existingUser); ajax.put(Constants.TOKEN, token); + ajax.put("isNewUser", false); return ajax; }else { JSONObject phoneInfo = wechatUtil.decryptPhoneNumber(dto.getEncryptedData(), sessionKey, dto.getIv()); @@ -283,6 +284,7 @@ public class SysLoginService // 5. 生成系统令牌 String token = loginUserIdApp(appUser); ajax.put(Constants.TOKEN, token); + ajax.put("isNewUser", true); return ajax; } }