From 2e6785b34d953e431699bad244d86d9b9ec66bf6 Mon Sep 17 00:00:00 2001 From: sh Date: Fri, 31 Oct 2025 12:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E6=88=91?= =?UTF-8?q?=E7=9A=84=E4=B8=AD-=E8=B6=B3=E8=BF=B9=E3=80=81=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E3=80=81=E5=B2=97=E4=BD=8D=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/cms/CmsAppUserController.java | 17 +++- .../java/com/ruoyi/cms/domain/vo/MyChart.java | 11 +++ .../com/ruoyi/cms/mapper/AppUserMapper.java | 3 + .../ruoyi/cms/service/IAppUserService.java | 4 + .../cms/service/impl/AppUserServiceImpl.java | 6 ++ .../cms/service/impl/ESJobSearchImpl.java | 96 +++++++++---------- .../resources/mapper/app/AppUserMapper.xml | 7 ++ 7 files changed, 94 insertions(+), 50 deletions(-) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index 5379b5a..239c426 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -3,9 +3,11 @@ package com.ruoyi.cms.controller.cms; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.common.annotation.BussinessLog; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -148,7 +150,6 @@ public class CmsAppUserController extends BaseController } @ApiOperation("查询APP用户列表") -// @PreAuthorize("@ss.hasPermi('cms:appUser:list')") @GetMapping("/noTmlist") public TableDataInfo noTmlist(AppUser appUser) { @@ -156,4 +157,18 @@ public class CmsAppUserController extends BaseController List list = appUserService.selectNoTmAppUserList(appUser); return getDataTable(list); } + + @ApiOperation("查询我的中（已经投递的，收藏的，足迹，预约）") + @GetMapping("/getMyTj") + public AjaxResult getMyTj() + { + if(!SecurityUtils.isLogin()){ + return AjaxResult.error("未登录!"); + } + if(StringUtils.isEmpty(RoleUtils.getCurrentUseridCard())){ + return AjaxResult.error("用户信息为空!"); + } + AppUser appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + return AjaxResult.success(appUserService.getMyTj(appUser.getUserId())); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java new file mode 100644 index 0000000..91477c8 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java @@ -0,0 +1,11 @@ +package com.ruoyi.cms.domain.vo; + +import lombok.Data; + +@Data +public class MyChart { + private String ytd; + private String ysc; + private String yzj; + private String yyy; +} 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 229d4bb..226d896 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; import java.util.Map; +import com.ruoyi.cms.domain.vo.MyChart; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.SysUser; @@ -29,4 +30,6 @@ public interface AppUserMapper extends BaseMapper int insertSysUserRole(Map map); int insertSysUser(SysUser sysUser); + + MyChart getMyTj(Long userId); } 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 bfb0d49..cfecd5c 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 @@ -1,6 +1,8 @@ package com.ruoyi.cms.service; import java.util.List; + +import com.ruoyi.cms.domain.vo.MyChart; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.cms.domain.vo.AppUserLky; import com.ruoyi.common.core.domain.model.RegisterBody; @@ -68,4 +70,6 @@ public interface IAppUserService public int editRegisterUser(RegisterBody registerBody); public List selectNoTmAppUserList(AppUser appUser); + + public MyChart getMyTj(Long userId); } 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 c179225..5369abb 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,6 +5,7 @@ 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.MyChart; import com.ruoyi.common.core.domain.entity.File; import com.ruoyi.cms.domain.vo.AppSkillVo; import com.ruoyi.cms.mapper.*; @@ -331,4 +332,9 @@ public class AppUserServiceImpl extends ServiceImpl imple { return appUserMapper.selectAppUserList(appUser); } + + @Override + public MyChart getMyTj(Long userId) { + return appUserMapper.getMyTj(userId); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index 344aa55..49a502f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -605,56 +605,54 @@ public class ESJobSearchImpl implements IESJobSearchService ESJobSearch newSearch = new ESJobSearch(); BeanUtils.copyProperties(esJobSearch,newSearch); //查询 - if(SecurityUtils.isLogin()){ - if(appUser!=null){ - if(!ListUtil.isEmptyOrNull(appUser.getJobTitle())){ - List jobTitle = appUser.getJobTitle(); - newSearch.setJobTitle(String.join(",", jobTitle)); - } - if(!StringUtil.isEmptyOrNull(appUser.getEducation())){ - newSearch.setEducation(appUser.getEducation()); - } - if(!StringUtil.isEmptyOrNull(appUser.getArea())){ - newSearch.setArea(appUser.getArea()); - } - if(!StringUtil.isEmptyOrNull(appUser.getExperience())){ - newSearch.setExperience(appUser.getExperience()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){ - newSearch.setExperience(esJobSearch.getExperience()); - } - if(!StringUtil.isEmptyOrNull(appUser.getSalaryMax())){ - newSearch.setMaxSalary(Long.valueOf(appUser.getSalaryMax())); - } - if(!StringUtil.isEmptyOrNull(appUser.getSalaryMin())){ - newSearch.setMinSalary(Long.valueOf(appUser.getSalaryMin())); - } - } + if(appUser!=null){ + if(!ListUtil.isEmptyOrNull(appUser.getJobTitle())){ + List jobTitle = appUser.getJobTitle(); + newSearch.setJobTitle(String.join(",", jobTitle)); + } + if(!StringUtil.isEmptyOrNull(appUser.getEducation())){ + newSearch.setEducation(appUser.getEducation()); + } + if(!StringUtil.isEmptyOrNull(appUser.getArea())){ + newSearch.setArea(appUser.getArea()); + } + if(!StringUtil.isEmptyOrNull(appUser.getExperience())){ + newSearch.setExperience(appUser.getExperience()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){ + newSearch.setExperience(esJobSearch.getExperience()); + } + if(!StringUtil.isEmptyOrNull(appUser.getSalaryMax())){ + newSearch.setMaxSalary(Long.valueOf(appUser.getSalaryMax())); + } + if(!StringUtil.isEmptyOrNull(appUser.getSalaryMin())){ + newSearch.setMinSalary(Long.valueOf(appUser.getSalaryMin())); + } + } - if(!StringUtil.isEmptyOrNull(esJobSearch.getArea())){ - newSearch.setArea(esJobSearch.getArea()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getEducation())){ - newSearch.setEducation(esJobSearch.getEducation()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){ - newSearch.setJobTitle(esJobSearch.getJobTitle()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){ - newSearch.setJobType(esJobSearch.getJobType()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){ - newSearch.setType(esJobSearch.getType()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getDescription())){ - newSearch.setDescription(esJobSearch.getDescription()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyNature())){ - newSearch.setCompanyNature(esJobSearch.getCompanyNature()); - } - if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){ - newSearch.setCode(esJobSearch.getCode()); - } + if(!StringUtil.isEmptyOrNull(esJobSearch.getArea())){ + newSearch.setArea(esJobSearch.getArea()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getEducation())){ + newSearch.setEducation(esJobSearch.getEducation()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){ + newSearch.setJobTitle(esJobSearch.getJobTitle()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){ + newSearch.setJobType(esJobSearch.getJobType()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){ + newSearch.setType(esJobSearch.getType()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getDescription())){ + newSearch.setDescription(esJobSearch.getDescription()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyNature())){ + newSearch.setCompanyNature(esJobSearch.getCompanyNature()); + } + if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){ + newSearch.setCode(esJobSearch.getCode()); } LambdaEsQueryWrapper wrapper = getWrapper(newSearch,jobIds); diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml index b0b39d4..ce40d9d 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml @@ -108,4 +108,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + \ No newline at end of file