1.给劳科院提供查询接口:当前职位名称、技能标签(中文名为主)
2.修改app_user技能接口
This commit is contained in:
@@ -24,7 +24,7 @@ import java.util.List;
|
|||||||
* @date 2025-10-21 12:22:09
|
* @date 2025-10-21 12:22:09
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/appskill/list")
|
@RequestMapping("/app/appskill")
|
||||||
@Api(tags = "移动端:用户技能")
|
@Api(tags = "移动端:用户技能")
|
||||||
public class AppSkillController extends BaseController {
|
public class AppSkillController extends BaseController {
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.ruoyi.cms.service.*;
|
|||||||
import com.ruoyi.common.annotation.BussinessLog;
|
import com.ruoyi.common.annotation.BussinessLog;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
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.domain.model.RegisterBody;
|
||||||
import com.ruoyi.common.core.page.TableDataInfo;
|
import com.ruoyi.common.core.page.TableDataInfo;
|
||||||
import com.ruoyi.common.utils.SiteSecurityUtils;
|
import com.ruoyi.common.utils.SiteSecurityUtils;
|
||||||
@@ -135,4 +136,16 @@ public class AppUserController extends BaseController
|
|||||||
List<AppUser> list = appUserService.selectAppUserList(appUser);
|
List<AppUser> list = appUserService.selectAppUserList(appUser);
|
||||||
return AjaxResult.success(list);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -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<AppSkillVo> appSkillsList;
|
||||||
|
|
||||||
|
@ApiModelProperty("当前职位名称")
|
||||||
|
private List<String> jobTitles;
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.ruoyi.cms.mapper;
|
package com.ruoyi.cms.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.ruoyi.cms.domain.vo.AppSkillVo;
|
||||||
import com.ruoyi.common.core.domain.entity.AppSkill;
|
import com.ruoyi.common.core.domain.entity.AppSkill;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -17,4 +18,6 @@ public interface AppSkillMapper extends BaseMapper<AppSkill> {
|
|||||||
List<AppSkill> getList(AppSkill appSkill);
|
List<AppSkill> getList(AppSkill appSkill);
|
||||||
|
|
||||||
int batchInsert(List<AppSkill> list);
|
int batchInsert(List<AppSkill> list);
|
||||||
|
|
||||||
|
List<AppSkillVo> getUserSkillList(AppSkill appSkill);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.ruoyi.cms.service;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import com.ruoyi.common.core.domain.entity.AppUser;
|
import com.ruoyi.common.core.domain.entity.AppUser;
|
||||||
|
import com.ruoyi.cms.domain.vo.AppUserLky;
|
||||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -59,4 +60,6 @@ public interface IAppUserService
|
|||||||
public AppUser registerAppUser(RegisterBody registerBody);
|
public AppUser registerAppUser(RegisterBody registerBody);
|
||||||
|
|
||||||
public AppUser selectAppuserByIdcard(String idCard);
|
public AppUser selectAppuserByIdcard(String idCard);
|
||||||
|
|
||||||
|
public AppUserLky selectAppUserInfo(AppUser appUser);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,11 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.ruoyi.cms.domain.vo.AppSkillVo;
|
||||||
import com.ruoyi.cms.mapper.*;
|
import com.ruoyi.cms.mapper.*;
|
||||||
import com.ruoyi.cms.util.StringUtil;
|
import com.ruoyi.cms.util.StringUtil;
|
||||||
import com.ruoyi.common.core.domain.entity.*;
|
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.core.domain.model.RegisterBody;
|
||||||
import com.ruoyi.common.utils.SecurityUtils;
|
import com.ruoyi.common.utils.SecurityUtils;
|
||||||
import com.ruoyi.common.utils.SiteSecurityUtils;
|
import com.ruoyi.common.utils.SiteSecurityUtils;
|
||||||
@@ -215,4 +217,23 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
|
|||||||
public AppUser selectAppuserByIdcard(String idCard) {
|
public AppUser selectAppuserByIdcard(String idCard) {
|
||||||
return appUserMapper.selectOne(Wrappers.<AppUser>lambdaQuery().eq(AppUser::getIdCard, idCard).orderByDesc(AppUser::getUpdateTime).last("LIMIT 1"));
|
return appUserMapper.selectOne(Wrappers.<AppUser>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<String> list = Arrays.asList(appUser.getJobTitleId().split(","));
|
||||||
|
List<Long> collect = list.stream().map(Long::valueOf).collect(Collectors.toList());
|
||||||
|
List<JobTitle> jobs = jobTitleMapper.selectBatchIds(collect);
|
||||||
|
lky.setJobTitles(jobs.stream().map(JobTitle::getJobName).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
//查询用户技能
|
||||||
|
AppSkill parmsk=new AppSkill();
|
||||||
|
parmsk.setUserId(appUser.getUserId());
|
||||||
|
List<AppSkillVo> skillList=appSkillMapper.getUserSkillList(parmsk);
|
||||||
|
//回填
|
||||||
|
lky.setAppSkillsList(skillList);
|
||||||
|
return lky;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
select id, user_id, name, levels, del_flag, create_by, create_time, update_by, update_time, remark from app_skill
|
select id, user_id, name, levels, del_flag, create_by, create_time, update_by, update_time, remark from app_skill
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="getList" resultType="AppSkill" resultMap="AppSkillResult">
|
<select id="getList" parameterType="AppSkill" resultMap="AppSkillResult">
|
||||||
<include refid="selectAppSkillVo"/>
|
<include refid="selectAppSkillVo"/>
|
||||||
<where> del_flag = '0'
|
<where> del_flag = '0'
|
||||||
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="batchInsert" parameterType="java.util.List">
|
<insert id="batchInsert" parameterType="AppSkill">
|
||||||
INSERT INTO app_skill (
|
INSERT INTO app_skill (
|
||||||
user_id, name, levels, create_by, create_time, del_flag
|
user_id, name, levels, create_by, create_time, del_flag
|
||||||
) VALUES
|
) VALUES
|
||||||
@@ -42,4 +42,19 @@
|
|||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
<resultMap type="com.ruoyi.cms.domain.vo.AppSkillVo" id="AppSkillVoResult">
|
||||||
|
<result property="userId" column="user_id"/>
|
||||||
|
<result property="name" column="name"/>
|
||||||
|
<result property="levels" column="levels"/>
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
<select id="getUserSkillList" parameterType="com.ruoyi.cms.domain.vo.AppSkillVo" resultMap="AppSkillVoResult">
|
||||||
|
select name, levels,user_id from app_skill
|
||||||
|
<where> del_flag = '0'
|
||||||
|
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
|
||||||
|
<if test="levels != null and levels != ''"> and levels = #{levels}</if>
|
||||||
|
<if test="userId != null"> and user_id = #{userId}</if>
|
||||||
|
</where>
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user