From 65250f9673a2c50c4946c5d1cf15fcffbdd9e58e Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 28 Oct 2025 13:44:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=99=E5=8A=B3=E7=A7=91=E9=99=A2=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=9A=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=81=8C=E4=BD=8D=E5=90=8D=E7=A7=B0=E3=80=81=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E6=A0=87=E7=AD=BE=EF=BC=88=E4=B8=AD=E6=96=87=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E4=B8=BB=EF=BC=89=202.=E4=BF=AE=E6=94=B9app=5Fuser?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSkillController.java | 2 +- .../cms/controller/app/AppUserController.java | 13 +++++++++++ .../com/ruoyi/cms/domain/vo/AppSkillVo.java | 17 ++++++++++++++ .../com/ruoyi/cms/domain/vo/AppUserLky.java | 22 +++++++++++++++++++ .../com/ruoyi/cms/mapper/AppSkillMapper.java | 3 +++ .../ruoyi/cms/service/IAppUserService.java | 3 +++ .../cms/service/impl/AppUserServiceImpl.java | 21 ++++++++++++++++++ .../resources/mapper/app/AppSkillMapper.xml | 19 ++++++++++++++-- 8 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppSkillVo.java create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java 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 index f4ea8b2..7b744d0 100644 --- 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 @@ -24,7 +24,7 @@ import java.util.List; * @date 2025-10-21 12:22:09 */ @RestController -@RequestMapping("/appskill/list") +@RequestMapping("/app/appskill") @Api(tags = "移动端:用户技能") public class AppSkillController extends BaseController { @Autowired 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 ef2f60a..cad8f6f 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 @@ -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.cms.domain.vo.AppUserLky; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.SiteSecurityUtils; @@ -135,4 +136,16 @@ public class AppUserController extends BaseController List list = appUserService.selectAppUserList(appUser); return AjaxResult.success(list); } + + @ApiOperation("返回求职者劳科院-当前职位名称、技能标签") + @GetMapping("/appUserInfo") + public AjaxResult appUserInfo(AppUser appUser) + { + if(!SiteSecurityUtils.isLogin()){ + return AjaxResult.error("未登录！"); + } + appUser.setUserId(SiteSecurityUtils.getUserId()); + AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser); + return AjaxResult.success(appUserLky); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppSkillVo.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppSkillVo.java new file mode 100644 index 0000000..7c54bff --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppSkillVo.java @@ -0,0 +1,17 @@ +package com.ruoyi.cms.domain.vo; + +import com.ruoyi.common.core.domain.entity.AppSkill; +import lombok.Data; + +@Data +public class AppSkillVo extends AppSkill { + + /** + * 技能名称 + */ + private String nameStr; + /** + * 技能等级 + */ + private String levelStr; +} diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java new file mode 100644 index 0000000..207064b --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java @@ -0,0 +1,22 @@ +package com.ruoyi.cms.domain.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 用户注册对象 + * + * @author ruoyi + */ +@Data +public class AppUserLky +{ + + @ApiModelProperty("技能列表") + private List appSkillsList; + + @ApiModelProperty("当前职位名称") + private List jobTitles; +} 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 index b1b411a..8bd7c7b 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppSkillMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppSkillMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.cms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cms.domain.vo.AppSkillVo; import com.ruoyi.common.core.domain.entity.AppSkill; import java.util.List; @@ -17,4 +18,6 @@ public interface AppSkillMapper extends BaseMapper { List getList(AppSkill appSkill); int batchInsert(List list); + + List getUserSkillList(AppSkill appSkill); } 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 72a4014..7857e2a 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.cms.domain.vo.AppUserLky; import com.ruoyi.common.core.domain.model.RegisterBody; /** @@ -59,4 +60,6 @@ public interface IAppUserService public AppUser registerAppUser(RegisterBody registerBody); public AppUser selectAppuserByIdcard(String idCard); + + public AppUserLky selectAppUserInfo(AppUser appUser); } 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 faf48de..329fc9b 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 @@ -8,9 +8,11 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.cms.domain.vo.AppSkillVo; import com.ruoyi.cms.mapper.*; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.core.domain.entity.*; +import com.ruoyi.cms.domain.vo.AppUserLky; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SiteSecurityUtils; @@ -215,4 +217,23 @@ public class AppUserServiceImpl extends ServiceImpl imple public AppUser selectAppuserByIdcard(String idCard) { return appUserMapper.selectOne(Wrappers.lambdaQuery().eq(AppUser::getIdCard, idCard).orderByDesc(AppUser::getUpdateTime).last("LIMIT 1")); } + + @Override + public AppUserLky selectAppUserInfo(AppUser appUser) { + AppUserLky lky=new AppUserLky(); + appUser=appUserMapper.selectById(appUser.getUserId()); + if(StringUtils.isNotEmpty(appUser.getJobTitleId())){ + List list = Arrays.asList(appUser.getJobTitleId().split(",")); + List collect = list.stream().map(Long::valueOf).collect(Collectors.toList()); + List jobs = jobTitleMapper.selectBatchIds(collect); + lky.setJobTitles(jobs.stream().map(JobTitle::getJobName).collect(Collectors.toList())); + } + //查询用户技能 + AppSkill parmsk=new AppSkill(); + parmsk.setUserId(appUser.getUserId()); + List skillList=appSkillMapper.getUserSkillList(parmsk); + //回填 + lky.setAppSkillsList(skillList); + return lky; + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml index eb08ef3..fd2e7f1 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppSkillMapper.xml @@ -22,7 +22,7 @@ select id, user_id, name, levels, del_flag, create_by, create_time, update_by, update_time, remark from app_skill - del_flag = '0' and name like concat('%', #{name}, '%') @@ -30,7 +30,7 @@ - + INSERT INTO app_skill ( user_id, name, levels, create_by, create_time, del_flag ) VALUES @@ -42,4 +42,19 @@ + + + + + + + +