lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oss 单点

Browse Source
This commit is contained in:
Lishundong
2025-10-11 16:02:04 +08:00
parent 0076eeeb48
commit db413c57aa
34 changed files with 771 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java
View File

@@ -1,6 +1,6 @@
package com.ruoyi.cms.controller.app;
import com.ruoyi.cms.domain.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.JobFair;
@@ -10,7 +10,7 @@ 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.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +50,7 @@ public class AppUserController extends BaseController
@BussinessLog(title = "保存简历")
public AjaxResult saveResume(@RequestBody AppUser appUser)
{
appUser.setUserId(SecurityUtils.getUserId());
appUser.setUserId(SiteSecurityUtils.getUserId());
appUserService.updateAppUser(appUser);
return AjaxResult.success();
}
@@ -58,7 +58,7 @@ public class AppUserController extends BaseController
@GetMapping("/resume")
public AjaxResult getResume()
{
AppUser appUser = appUserService.selectAppUserByUserId(SecurityUtils.getUserId());
AppUser appUser = appUserService.selectAppUserByUserId(SiteSecurityUtils.getUserId());
return AjaxResult.success(appUser);
}
@ApiOperation("我的浏览")

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
View File

@@ -18,7 +18,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ruoyi.cms.domain.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.cms.service.IAppUserService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

112
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/AppUser.java
View File

@@ -1,112 +0,0 @@
package com.ruoyi.cms.domain;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
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;
/**
* APP用户对象 app_user
* @author lishundong
* @date 2024-09-03
*/
@Data
@ApiModel("APP用户")
@TableName(value = "app_user")
public class AppUser extends BaseEntity
{
@TableField(exist = false)
private static final long serialVersionUID = 1L;
@TableId(value = "user_id",type = IdType.AUTO)
@ApiModelProperty("用户ID")
private Long userId;
@Excel(name = "用户名称")
@ApiModelProperty("用户名称")
private String name;
@Excel(name = "年龄段 对应字典age")
@ApiModelProperty("年龄段 对应字典age")
private String age;
@Excel(name = "用户性别", readConverterExp = "0=男,1=女")
@ApiModelProperty("用户性别（0男 1女）对应字典sex")
private String sex;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("生日")
private Date birthDate;
@Excel(name = "学历 对应字典education")
@ApiModelProperty("学历 对应字典education")
private String education;
@Excel(name = "政治面貌")
@ApiModelProperty("政治面貌")
private String politicalAffiliation;
@Excel(name = "手机号码")
@ApiModelProperty("手机号码")
private String phone;
@Excel(name = "头像地址")
@ApiModelProperty("头像地址")
private String avatar;
@Excel(name = "最低工资")
@ApiModelProperty("最低工资")
private String salaryMin;
@Excel(name = "最高工资")
@ApiModelProperty("最高工资")
private String salaryMax;
@Excel(name = "期望工作地 对应字典area")
@ApiModelProperty("期望工作地 对应字典area")
private String area;
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
@ApiModelProperty("帐号状态（0正常 1停用）")
private String status;
@Excel(name = "最后登录IP")
@ApiModelProperty("最后登录IP")
private String loginIp;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最后登录时间")
private Date loginDate;
@ApiModelProperty("期望岗位,逗号分隔")
private String jobTitleId;
@ApiModelProperty("期望薪资")
private String experience;
@ApiModelProperty("是否开启推荐（0不推荐 1推荐）")
private Integer isRecommend;
@TableField(exist = false)
@ApiModelProperty("期望岗位列表")
private List<String> jobTitle;
@ApiModelProperty("身份证")
private String idCard;
@ApiModelProperty("是否录用 0录用,1未录用")
private String hire;
@ApiModelProperty("是否企业用户 0是，1否")
private String isCompanyUser;
}

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/CandidateVO.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.cms.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.cms.domain.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
import lombok.Data;
import java.util.Date;

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java
View File

@@ -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.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
/**
* APP用户Mapper接口

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
View File

@@ -1,7 +1,7 @@
package com.ruoyi.cms.service;
import java.util.List;
import com.ruoyi.cms.domain.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
/**
* APP用户Service接口

12
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppNoticeServiceImpl.java
View File

@@ -6,11 +6,11 @@ import com.ruoyi.cms.domain.*;
import com.ruoyi.cms.mapper.*;
import com.ruoyi.cms.service.IAppNoticeService;
import com.ruoyi.cms.util.StringUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -154,14 +154,14 @@ public class AppNoticeServiceImpl implements IAppNoticeService
@Override
public List<Notice> listNotRead(Integer isRead) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<Notice> sysNoticeList = noticeInfoMapper.selectList(Wrappers.<Notice>lambdaQuery().eq(Notice::getUserId, userId).eq(Notice::getRemark,"notice_bar").orderByDesc(Notice::getCreateTime));
return sysNoticeList;
}
@Override
public List<Job> recommend(String jobTitle) {
return appNoticeMapper.recommend(jobTitle,SecurityUtils.getUserId());
return appNoticeMapper.recommend(jobTitle,SiteSecurityUtils.getUserId());
}
@Override
@@ -172,7 +172,7 @@ public class AppNoticeServiceImpl implements IAppNoticeService
notice.setIsRead(1);
noticeInfoMapper.updateById(notice);
});
List<Notice> notices1 = noticeInfoMapper.selectList(Wrappers.<Notice>lambdaQuery().eq(Notice::getUserId, SecurityUtils.getUserId()).eq(Notice::getRemark, "notice_bar").eq(Notice::getTitle, "系统通知").orderByDesc(Notice::getCreateTime).last("limit 1"));
List<Notice> notices1 = noticeInfoMapper.selectList(Wrappers.<Notice>lambdaQuery().eq(Notice::getUserId, SiteSecurityUtils.getUserId()).eq(Notice::getRemark, "notice_bar").eq(Notice::getTitle, "系统通知").orderByDesc(Notice::getCreateTime).last("limit 1"));
Notice notice = notices1.get(0);
notice.setNotReadCount(notice.getNotReadCount() - longs.size());
if(notice.getNotReadCount()==0){
@@ -194,7 +194,7 @@ public class AppNoticeServiceImpl implements IAppNoticeService
@Override
public List<Notice> sysNoticeList() {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<Notice> sysNoticeList = noticeInfoMapper.selectList(Wrappers.<Notice>lambdaQuery().eq(Notice::getUserId, userId).isNotNull(Notice::getNoticeType).notIn(Notice::getNoticeType,"").orderByDesc(Notice::getCreateTime));
return sysNoticeList;
}

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppReviewJobServiceImpl.java
View File

@@ -6,7 +6,7 @@ import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.query.MineJobQuery;
import com.ruoyi.cms.mapper.AppReviewJobMapper;
import com.ruoyi.cms.service.IAppReviewJobService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -91,13 +91,13 @@ public class AppReviewJobServiceImpl extends ServiceImpl<AppReviewJobMapper, App
@Override
public List<Job> review(MineJobQuery jobQuery) {
List<Job> jobs = appReviewJobMapper.review(SecurityUtils.getUserId(),jobQuery);
List<Job> jobs = appReviewJobMapper.review(SiteSecurityUtils.getUserId(),jobQuery);
return jobs;
}
@Override
public List<String> reviewArray() {
List<AppReviewJob> appReviewJobs = appReviewJobMapper.reviewArray(SecurityUtils.getUserId());
List<AppReviewJob> appReviewJobs = appReviewJobMapper.reviewArray(SiteSecurityUtils.getUserId());
return appReviewJobs.stream().map(x -> formatter.format(x.getReviewDate())).collect(Collectors.toList());
}
}

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
View File

@@ -12,7 +12,7 @@ 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.cms.domain.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.cms.service.IAppUserService;
/**

12
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCardServiceImpl.java
View File

@@ -11,7 +11,7 @@ import com.ruoyi.cms.domain.CompanyCardCollection;
import com.ruoyi.cms.domain.vo.CompanyCardVO;
import com.ruoyi.cms.mapper.CompanyCardCollectionMapper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -100,9 +100,9 @@ public class CompanyCardServiceImpl extends ServiceImpl<CompanyCardMapper,Compan
CompanyCard companyCard = new CompanyCard();
companyCard.setStatus(1);
List<CompanyCardVO> companyCards = companyCardMapper.selectCompanyCardListVO(companyCard);
if(SecurityUtils.isLogin()){
if(SiteSecurityUtils.isLogin()){
CompanyCardCollection companyCardCollection = new CompanyCardCollection();
companyCardCollection.setUserId(SecurityUtils.getUserId());
companyCardCollection.setUserId(SiteSecurityUtils.getUserId());
List<CompanyCardCollection> companyCardCollections = companyCardCollectionMapper.selectCompanyCardCollectionList(companyCardCollection);
for (CompanyCardVO item:companyCards){
for(CompanyCardCollection collection:companyCardCollections){
@@ -119,7 +119,7 @@ public class CompanyCardServiceImpl extends ServiceImpl<CompanyCardMapper,Compan
public void cardCollection(Long companyCardId) {
CompanyCardCollection companyCardCollection = new CompanyCardCollection();
companyCardCollection.setCompanyCardId(companyCardId);
companyCardCollection.setUserId(SecurityUtils.getUserId());
companyCardCollection.setUserId(SiteSecurityUtils.getUserId());
companyCardCollectionService.save(companyCardCollection);
}
@@ -127,8 +127,8 @@ public class CompanyCardServiceImpl extends ServiceImpl<CompanyCardMapper,Compan
public void cardCancel(Long companyCardId) {
CompanyCardCollection companyCardCollection = new CompanyCardCollection();
companyCardCollection.setCompanyCardId(companyCardId);
companyCardCollection.setUserId(SecurityUtils.getUserId());
List<CompanyCardCollection> companyCardCollections = companyCardCollectionMapper.selectList(Wrappers.<CompanyCardCollection>lambdaQuery().eq(CompanyCardCollection::getCompanyCardId, companyCardId).eq(CompanyCardCollection::getUserId, SecurityUtils.getUserId()));
companyCardCollection.setUserId(SiteSecurityUtils.getUserId());
List<CompanyCardCollection> companyCardCollections = companyCardCollectionMapper.selectList(Wrappers.<CompanyCardCollection>lambdaQuery().eq(CompanyCardCollection::getCompanyCardId, companyCardId).eq(CompanyCardCollection::getUserId, SiteSecurityUtils.getUserId()));
companyCardCollectionMapper.deleteBatchIds(companyCardCollections.stream().map(CompanyCardCollection::getCompanyCardCollectionId).collect(Collectors.toList()));
}
}

8
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyCollectionServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.mapper.JobMapper;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -93,7 +93,7 @@ public class CompanyCollectionServiceImpl extends ServiceImpl<CompanyCollectionM
*/
@Override
public int companyCancel(Long companyId) {
List<CompanyCollection> companyCollections = companyCollectionMapper.selectList(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SecurityUtils.getUserId()));
List<CompanyCollection> companyCollections = companyCollectionMapper.selectList(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SiteSecurityUtils.getUserId()));
if(companyCollections.size()>0){
companyCollectionMapper.deleteBatchIds(companyCollections.stream().map(CompanyCollection::getId).collect(Collectors.toList()));
}
@@ -104,7 +104,7 @@ public class CompanyCollectionServiceImpl extends ServiceImpl<CompanyCollectionM
*/
@Override
public int companyCollection(Long companyId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<CompanyCollection> companyCollections = companyCollectionMapper.selectList(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, userId));
if(companyCollections.size()>0){
companyCollectionMapper.deleteBatchIds(companyCollections.stream().map(CompanyCollection::getId).collect(Collectors.toList()));
@@ -118,7 +118,7 @@ public class CompanyCollectionServiceImpl extends ServiceImpl<CompanyCollectionM
@Override
public List<Company> collectionCompany() {
List<Company> companies = companyCollectionMapper.collectionJob(SecurityUtils.getUserId());
List<Company> companies = companyCollectionMapper.collectionJob(SiteSecurityUtils.getUserId());
return companies;
}

10
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java
View File

@@ -11,7 +11,7 @@ import com.ruoyi.cms.domain.query.LabelQuery;
import com.ruoyi.cms.mapper.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -53,8 +53,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper,Company> imple
public Company selectCompanyByCompanyId(Long companyId)
{
Company company = companyMapper.selectById(companyId);
if(SecurityUtils.isLogin()){
Long l = companyCollectionMapper.selectCount(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SecurityUtils.getUserId()));
if(SiteSecurityUtils.isLogin()){
Long l = companyCollectionMapper.selectCount(Wrappers.<CompanyCollection>lambdaQuery().eq(CompanyCollection::getCompanyId, companyId).eq(CompanyCollection::getUserId, SiteSecurityUtils.getUserId()));
company.setIsCollection(l>0?1:0);
}else {
company.setIsCollection(0);
@@ -241,7 +241,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper,Company> imple
@Override
public void register(Company company) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
company.setUserId(userId);
if(companyMapper.selectCount(Wrappers.<Company>lambdaQuery().eq(Company::getName, company.getName()).in(Company::getStatus,Arrays.asList(0,1)))>0){
throw new ServiceException(company.getName()+"已经存在");
@@ -251,7 +251,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper,Company> imple
@Override
public Company registerStatus() {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
Company company = companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUserId, userId).orderByDesc(Company::getUpdateTime));
return company;
}

14
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
View File

@@ -1,18 +1,16 @@
package com.ruoyi.cms.service.impl;
import com.ruoyi.cms.domain.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.cms.domain.ESJobDocument;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.query.ESJobSearch;
import com.ruoyi.cms.mapper.es.EsJobDocumentMapper;
import com.ruoyi.cms.mapper.JobMapper;
import com.ruoyi.cms.service.IESJobSearchService;
import com.ruoyi.cms.util.Base64Util;
import com.ruoyi.cms.util.ListUtil;
import com.ruoyi.cms.util.StringUtil;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import org.dromara.easyes.core.biz.EsPageInfo;
import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
@@ -140,8 +138,8 @@ public class ESJobSearchImpl implements IESJobSearchService
ESJobSearch newSearch = new ESJobSearch();
BeanUtils.copyProperties(esJobSearch,newSearch);
//查询
if(SecurityUtils.isLogin()){
AppUser appUser = appUserService.selectAppUserByUserId(SecurityUtils.getUserId());
if(SiteSecurityUtils.isLogin()){
AppUser appUser = appUserService.selectAppUserByUserId(SiteSecurityUtils.getUserId());
if(!ListUtil.isEmptyOrNull(appUser.getJobTitle())){
List<String> jobTitle = appUser.getJobTitle();
newSearch.setJobTitle(String.join(",", jobTitle));
@@ -424,8 +422,8 @@ public class ESJobSearchImpl implements IESJobSearchService
Integer pageNum = jobQuery.getCurrent();
Integer pageSize = jobQuery.getPageSize();
LambdaEsQueryWrapper<ESJobDocument> wrapper = new LambdaEsQueryWrapper<>();
// if(SecurityUtils.isLogin()){
// AppUser appUser = appUserService.selectAppUserByUserId(SecurityUtils.getUserId());
// if(SiteSecurityUtils.isLogin()){
// AppUser appUser = appUserService.selectAppUserByUserId(SiteSecurityUtils.getUserId());
// if(!ListUtil.isEmptyOrNull(appUser.getJobTitle())){
// List<String> jobTitle = appUser.getJobTitle();
// jobQuery.setJobTitle(String.join(",", jobTitle));

10
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FairCollectionServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.ruoyi.cms.domain.JobFair;
import com.ruoyi.cms.mapper.FairCollectionMapper;
import com.ruoyi.cms.mapper.JobFairMapper;
import com.ruoyi.cms.service.IFairCollectionService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,7 +50,7 @@ public class FairCollectionServiceImpl extends ServiceImpl<FairCollectionMapper,
@Override
public List<FairCollection> selectFairCollectionList(FairCollection fairCollection)
{
List<FairCollection> fairCollections = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getUserId, SecurityUtils.getUserId()));
List<FairCollection> fairCollections = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getUserId, SiteSecurityUtils.getUserId()));
return fairCollections;
}
@@ -95,7 +95,7 @@ public class FairCollectionServiceImpl extends ServiceImpl<FairCollectionMapper,
@Override
@Transactional
public int fairCollection(Long fairId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<FairCollection> fairCollections = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getFairId, fairId).eq(FairCollection::getUserId, userId));
if(fairCollections.size()>0){
fairCollectionMapper.deleteBatchIds(fairCollections.stream().map(FairCollection::getId).collect(Collectors.toList()));
@@ -111,7 +111,7 @@ public class FairCollectionServiceImpl extends ServiceImpl<FairCollectionMapper,
*/
@Override
public int cancel(Long fairId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<FairCollection> fairCollections = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getFairId, fairId).eq(FairCollection::getUserId, userId));
if(fairCollections.size()>0){
fairCollectionMapper.deleteBatchIds(fairCollections.stream().map(FairCollection::getId).collect(Collectors.toList()));
@@ -123,6 +123,6 @@ public class FairCollectionServiceImpl extends ServiceImpl<FairCollectionMapper,
*/
@Override
public List<JobFair> appCollectionFair(Integer type) {
return jobFairMapper.selectAppList(SecurityUtils.getUserId(),type);
return jobFairMapper.selectAppList(SiteSecurityUtils.getUserId(),type);
}
}

2
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java
View File

@@ -12,7 +12,7 @@ import com.ruoyi.cms.mapper.FileMapper;
import com.ruoyi.cms.service.IFileService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.common.utils.uuid.UUID;
import org.springframework.beans.factory.annotation.Autowired;

14
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.ruoyi.cms.domain.JobApply;
import com.ruoyi.cms.domain.query.MineJobQuery;
import com.ruoyi.cms.mapper.*;
import com.ruoyi.cms.service.IJobApplyService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -98,17 +98,17 @@ public class JobApplyServiceImpl extends ServiceImpl<JobApplyMapper,JobApply> im
@Override
public List<Job> applyJob() {
List<Job> jobs = jobApplyMapper.applyJob(SecurityUtils.getUserId());
List<Job> jobs = jobApplyMapper.applyJob(SiteSecurityUtils.getUserId());
return jobs;
}
@Override
public HashMap<String, Integer> statistics() {
Integer applyCount = jobApplyMapper.applyJob(SecurityUtils.getUserId()).size();
Integer collectionJobCount = jobCollectionMapper.collectionJob(SecurityUtils.getUserId()).size();
Integer collectionCompanyCount = companyCollectionMapper.collectionJob(SecurityUtils.getUserId()).size();
Integer jobReviewCount = appReviewJobMapper.review(SecurityUtils.getUserId(),new MineJobQuery()).size();
Integer fairCollecitonCount = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getUserId, SecurityUtils.getUserId())).size();
Integer applyCount = jobApplyMapper.applyJob(SiteSecurityUtils.getUserId()).size();
Integer collectionJobCount = jobCollectionMapper.collectionJob(SiteSecurityUtils.getUserId()).size();
Integer collectionCompanyCount = companyCollectionMapper.collectionJob(SiteSecurityUtils.getUserId()).size();
Integer jobReviewCount = appReviewJobMapper.review(SiteSecurityUtils.getUserId(),new MineJobQuery()).size();
Integer fairCollecitonCount = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getUserId, SiteSecurityUtils.getUserId())).size();
HashMap<String, Integer> map = new HashMap<>();
map.put("applyCount", applyCount);
map.put("collectionCount", collectionJobCount+collectionCompanyCount);

11
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java
View File

@@ -14,7 +14,8 @@ import com.ruoyi.cms.mapper.AppUserMapper;
import com.ruoyi.cms.mapper.JobApplyMapper;
import com.ruoyi.cms.mapper.JobMapper;
import com.ruoyi.cms.service.IBussinessDictTypeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -106,7 +107,7 @@ public class JobCollectionServiceImpl extends ServiceImpl<JobCollectionMapper,Jo
@Override
@Transactional
public int jobCollection(Long jobId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<JobCollection> jobCollections = jobCollectionMapper.selectList(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, jobId).eq(JobCollection::getUserId, userId));
if(jobCollections.size()>0){
jobCollectionMapper.deleteBatchIds(jobCollections.stream().map(JobCollection::getId).collect(Collectors.toList()));
@@ -122,7 +123,7 @@ public class JobCollectionServiceImpl extends ServiceImpl<JobCollectionMapper,Jo
*/
@Override
public int cancel(Long jobId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<JobCollection> jobCollections = jobCollectionMapper.selectList(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, jobId).eq(JobCollection::getUserId, userId));
if(jobCollections.size()>0){
jobCollectionMapper.deleteBatchIds(jobCollections.stream().map(JobCollection::getId).collect(Collectors.toList()));
@@ -132,7 +133,7 @@ public class JobCollectionServiceImpl extends ServiceImpl<JobCollectionMapper,Jo
@Override
public int apply(Long jobId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
JobApply jobApply = new JobApply();
jobApply.setJobId(jobId);
jobApply.setUserId(userId);
@@ -149,7 +150,7 @@ public class JobCollectionServiceImpl extends ServiceImpl<JobCollectionMapper,Jo
@Override
public List<Job> collectionJob() {
List<Job> jobs = jobCollectionMapper.collectionJob(SecurityUtils.getUserId());
List<Job> jobs = jobCollectionMapper.collectionJob(SiteSecurityUtils.getUserId());
return jobs;
}

10
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobFairServiceImpl.java
View File

@@ -10,7 +10,7 @@ import com.ruoyi.cms.mapper.FairCollectionMapper;
import com.ruoyi.cms.mapper.FairCompanyMapper;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -148,8 +148,8 @@ public class JobFairServiceImpl extends ServiceImpl<JobFairMapper,JobFair> imple
List<Company> companyList = companyMapper.selectBatchIds(companyIds);
jobFair.setCompanyList(companyList);
}
if(SecurityUtils.isLogin()){
Long count = fairCollectionMapper.selectCount(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getFairId, fairId).eq(FairCollection::getUserId, SecurityUtils.getUserId()));
if(SiteSecurityUtils.isLogin()){
Long count = fairCollectionMapper.selectCount(Wrappers.<FairCollection>lambdaQuery().eq(FairCollection::getFairId, fairId).eq(FairCollection::getUserId, SiteSecurityUtils.getUserId()));
jobFair.setIsCollection(count>0?1:null);
}
return jobFair;
@@ -159,10 +159,10 @@ public class JobFairServiceImpl extends ServiceImpl<JobFairMapper,JobFair> imple
public List<JobFair> appList(JobFair jobFair) {
List<JobFair> fairCompanies = jobFairMapper.appList(jobFair);
if(fairCompanies.isEmpty()){return new ArrayList<>();}
if(SecurityUtils.isLogin()){
if(SiteSecurityUtils.isLogin()){
//收藏
Set<Long> collectionIds = fairCollectionMapper.selectList(Wrappers.<FairCollection>lambdaQuery()
.eq(FairCollection::getUserId, SecurityUtils.getUserId())
.eq(FairCollection::getUserId, SiteSecurityUtils.getUserId())
.in(FairCollection::getFairId, fairCompanies.stream().map(JobFair::getJobFairId).collect(Collectors.toList())))
.stream().map(FairCollection::getFairId).collect(Collectors.toSet());
for (JobFair j : fairCompanies) {

15
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobRecommentServiceImpl.java
View File

@@ -2,16 +2,15 @@ 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.AppUser;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.cms.domain.Job;
import com.ruoyi.cms.domain.JobApply;
import com.ruoyi.cms.domain.JobCollection;
import com.ruoyi.cms.mapper.AppUserMapper;
import com.ruoyi.cms.mapper.JobApplyMapper;
import com.ruoyi.cms.mapper.JobCollectionMapper;
import com.ruoyi.cms.service.IJobCollectionService;
import com.ruoyi.cms.service.IJobRecommentService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -100,7 +99,7 @@ public class JobRecommentServiceImpl extends ServiceImpl<JobCollectionMapper,Job
@Override
@Transactional
public int jobCollection(Long jobId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<JobCollection> jobCollections = jobCollectionMapper.selectList(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, jobId).eq(JobCollection::getUserId, userId));
if(jobCollections.size()>0){
jobCollectionMapper.deleteBatchIds(jobCollections.stream().map(JobCollection::getId).collect(Collectors.toList()));
@@ -116,7 +115,7 @@ public class JobRecommentServiceImpl extends ServiceImpl<JobCollectionMapper,Job
*/
@Override
public int cancel(Long jobId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
List<JobCollection> jobCollections = jobCollectionMapper.selectList(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, jobId).eq(JobCollection::getUserId, userId));
if(jobCollections.size()>0){
jobCollectionMapper.deleteBatchIds(jobCollections.stream().map(JobCollection::getId).collect(Collectors.toList()));
@@ -126,7 +125,7 @@ public class JobRecommentServiceImpl extends ServiceImpl<JobCollectionMapper,Job
@Override
public int apply(Long jobId) {
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
JobApply jobApply = new JobApply();
jobApply.setJobId(jobId);
jobApply.setUserId(userId);
@@ -143,13 +142,13 @@ public class JobRecommentServiceImpl extends ServiceImpl<JobCollectionMapper,Job
@Override
public List<Job> collectionJob() {
List<Job> jobs = jobCollectionMapper.collectionJob(SecurityUtils.getUserId());
List<Job> jobs = jobCollectionMapper.collectionJob(SiteSecurityUtils.getUserId());
return jobs;
}
@Override
public String competitiveness(Long jobId) {
AppUser appUser = appUserMapper.selectById(SecurityUtils.getUserId());
AppUser appUser = appUserMapper.selectById(SiteSecurityUtils.getUserId());
String education = appUser.getEducation();
return "90.5";
}

18
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java
View File

@@ -19,7 +19,7 @@ import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.JobTitle;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SiteSecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.dromara.easyes.core.biz.EsPageInfo;
import org.slf4j.Logger;
@@ -369,22 +369,22 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
Company company = companyMapper.selectById(job.getCompanyId());
job.setCompany(company);
}
if(SecurityUtils.isLogin()){
if(SiteSecurityUtils.isLogin()){
//查询申请信息
Long applyCount = jobApplyMapper.selectCount(Wrappers.<JobApply>lambdaQuery().eq(JobApply::getJobId, jobId).eq(JobApply::getUserId, SecurityUtils.getUserId()));
Long applyCount = jobApplyMapper.selectCount(Wrappers.<JobApply>lambdaQuery().eq(JobApply::getJobId, jobId).eq(JobApply::getUserId, SiteSecurityUtils.getUserId()));
job.setIsApply(applyCount>0?1:0);
//查询收藏信息
Long collectionCount = jobCollectionMapper.selectCount(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, jobId).eq(JobCollection::getUserId, SecurityUtils.getUserId()));
Long collectionCount = jobCollectionMapper.selectCount(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, jobId).eq(JobCollection::getUserId, SiteSecurityUtils.getUserId()));
job.setIsCollection(collectionCount>0?1:0);
//todo asyn
//保存浏览记录
List<AppReviewJob> appReviewJobs = appReviewJobMapper.selectList(Wrappers.<AppReviewJob>lambdaQuery().eq(AppReviewJob::getUserId, SecurityUtils.getUserId()).eq(AppReviewJob::getJobId, jobId));
List<AppReviewJob> appReviewJobs = appReviewJobMapper.selectList(Wrappers.<AppReviewJob>lambdaQuery().eq(AppReviewJob::getUserId, SiteSecurityUtils.getUserId()).eq(AppReviewJob::getJobId, jobId));
//之前相同岗位的记录删除 保存最新的浏览记录
if(!appReviewJobs.isEmpty()){
appReviewJobMapper.deleteBatchIds(appReviewJobs.stream().map(AppReviewJob::getId).collect(Collectors.toList()));
}
AppReviewJob appReviewJob = new AppReviewJob();
appReviewJob.setUserId(SecurityUtils.getUserId());
appReviewJob.setUserId(SiteSecurityUtils.getUserId());
LocalDateTime now = LocalDateTime.now();
String formattedDate = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
appReviewJob.setReviewDate(formattedDate);
@@ -749,10 +749,10 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
private List<ESJobDocument> userCollection(List<ESJobDocument> jobs){
if(jobs.isEmpty()){return new ArrayList<>();}
if(SecurityUtils.isLogin()){
if(SiteSecurityUtils.isLogin()){
//收藏
Set<Long> collectionIds = jobCollectionMapper.selectList(Wrappers.<JobCollection>lambdaQuery()
.eq(JobCollection::getUserId, SecurityUtils.getUserId())
.eq(JobCollection::getUserId, SiteSecurityUtils.getUserId())
.in(JobCollection::getJobId, jobs.stream().map(ESJobDocument::getJobId).collect(Collectors.toList())))
.stream().map(JobCollection::getJobId).collect(Collectors.toSet());
for (ESJobDocument j : jobs) {
@@ -767,7 +767,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
@Override
public void publishJob(Job job) {
job.setIsPublish(0);
Long userId = SecurityUtils.getUserId();
Long userId = SiteSecurityUtils.getUserId();
Company company = companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUserId, userId).eq(Company::getStatus, 1));
if(Objects.isNull(company)){
throw new ServiceException("请先完成招聘企业登记");