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

1.修改锁时间

Browse Source 
2.修改判断企业不维护时，返回空
This commit is contained in:
sh
2026-03-30 20:06:00 +08:00
parent a8a082ef9d
commit 403e43944e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,9 +58,9 @@ public class ESJobSearchImpl implements IESJobSearchService
// 锁的key（唯一标识ES索引初始化） // 锁的key（唯一标识ES索引初始化）
private static final String ES_INIT_LOCK_KEY = "es:job_document:init:lock"; private static final String ES_INIT_LOCK_KEY = "es:job_document:init:lock";
// 锁过期时间（30分钟，确保初始化完成） // 锁过期时间（30分钟，确保初始化完成）
private static final Integer LOCK_EXPIRE_SECONDS = 1800; private static final Integer LOCK_EXPIRE_SECONDS = 600;//1800
// 等待锁时间（5分钟，避免无限等待） // 等待锁时间（5分钟，避免无限等待）
private static final Integer WAIT_LOCK_SECONDS = 300; private static final Integer WAIT_LOCK_SECONDS = 1;//300
@Autowired @Autowired
@@ -114,7 +114,7 @@ public class ESJobSearchImpl implements IESJobSearchService
*/ */
private void releaseDistributedLock() { private void releaseDistributedLock() {
try { try {
redisCache.deleteObject(ES_INIT_LOCK_KEY); //redisCache.deleteObject(ES_INIT_LOCK_KEY);//不删除锁，30分钟自动过期
logger.info("已释放ES初始化分布式锁，key：{}", ES_INIT_LOCK_KEY); logger.info("已释放ES初始化分布式锁，key：{}", ES_INIT_LOCK_KEY);
} catch (Exception e) { } catch (Exception e) {
logger.error("释放ES初始化锁异常", e); logger.error("释放ES初始化锁异常", e);
@@ -225,10 +225,15 @@ public class ESJobSearchImpl implements IESJobSearchService
ESJobSearch newSearch = new ESJobSearch(); ESJobSearch newSearch = new ESJobSearch();
BeanUtils.copyProperties(esJobSearch,newSearch); BeanUtils.copyProperties(esJobSearch,newSearch);
boolean isCompanyUser = StringUtil.IS_COMPANY_USER.equals(esJobSearch.getUserType()); boolean isCompanyUser = false;
//查询 //查询
if(SiteSecurityUtils.isLogin()){ if(SiteSecurityUtils.isLogin()){
AppUser appUser = appUserService.selectAppUserByUserId(SiteSecurityUtils.getUserId()); AppUser appUser = appUserService.selectAppUserByUserId(SiteSecurityUtils.getUserId());
//判断为企业并且code为空时，返回null
isCompanyUser=StringUtil.IS_COMPANY_USER.equals(appUser.getIsCompanyUser());
if (isCompanyUser && StringUtil.isEmptyOrNull(esJobSearch.getCode())) {
return new ArrayList<>();
}
if (!StringUtil.isEmptyOrNull(esJobSearch.getCode())) { if (!StringUtil.isEmptyOrNull(esJobSearch.getCode())) {
newSearch.setCode(esJobSearch.getCode()); newSearch.setCode(esJobSearch.getCode());
} }