|
@@ -789,34 +789,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<SysOrgVO> loadingOrgCache() {
|
|
public List<SysOrgVO> loadingOrgCache() {
|
|
|
- RLock rLock=null;
|
|
|
|
|
- boolean lockflag=false;
|
|
|
|
|
- List<SysOrgVO> sysOrgVOS =new ArrayList<>();
|
|
|
|
|
- try {
|
|
|
|
|
-
|
|
|
|
|
- sysOrgVOS = baseMapper.selectSysOrgVOList();
|
|
|
|
|
- List<SysOrgVO> hsOrgs = sysOrgVOS.stream().filter(x -> ObjectUtil.equal(x.getType(), 3)).collect(Collectors.toList());
|
|
|
|
|
- RedissonClient redissonClient = RedisUtils.getClient();
|
|
|
|
|
- rLock= redissonClient.getLock("loadingOrgCache");
|
|
|
|
|
- lockflag= rLock.tryLock(200L,5000L, TimeUnit.MILLISECONDS);
|
|
|
|
|
- if(lockflag)
|
|
|
|
|
- {
|
|
|
|
|
- clearOrgCache();
|
|
|
|
|
- RedisUtils.setCacheList(CacheConstants.ORG_CACHE_LIST_KEY, sysOrgVOS);
|
|
|
|
|
- RedisUtils.setCacheList(CacheConstants.HS_ORG_CACHE_LIST_KEY, hsOrgs);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- catch (Exception e)
|
|
|
|
|
- {
|
|
|
|
|
- log.error(e.getMessage());
|
|
|
|
|
- }
|
|
|
|
|
- finally {
|
|
|
|
|
-
|
|
|
|
|
- if(lockflag&& rLock.isHeldByCurrentThread())
|
|
|
|
|
- {
|
|
|
|
|
- rLock.unlock();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ List<SysOrgVO> sysOrgVOS = baseMapper.selectSysOrgVOList();
|
|
|
|
|
+ List<SysOrgVO> hsOrgs = sysOrgVOS.stream().filter(x -> ObjectUtil.equal(x.getType(), 3)).collect(Collectors.toList());
|
|
|
|
|
+ clearOrgCache();
|
|
|
|
|
+ RedisUtils.setCacheList(CacheConstants.ORG_CACHE_LIST_KEY, sysOrgVOS);
|
|
|
|
|
+ RedisUtils.setCacheList(CacheConstants.HS_ORG_CACHE_LIST_KEY, hsOrgs);
|
|
|
return sysOrgVOS;
|
|
return sysOrgVOS;
|
|
|
}
|
|
}
|
|
|
|
|
|