|
@@ -1,6 +1,5 @@
|
|
|
package com.gis.admin.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.gis.common.base.mapper.IBaseMapper;
|
|
|
import com.gis.common.base.service.impl.IBaseServiceImpl;
|
|
|
import com.gis.common.util.Result;
|
|
@@ -16,7 +15,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.*;
|
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -101,6 +99,7 @@ public class SysResourceServiceImpl extends IBaseServiceImpl<SysResourceEntity,
|
|
|
|
|
|
@Override
|
|
|
public Result testCatch() {
|
|
|
+// List<SysResourceEntity> cacheAll2 = findCacheAll2();
|
|
|
List<SysResourceEntity> cacheAll2 = findCacheAll2();
|
|
|
|
|
|
SysResourceTreeUtil tree = new SysResourceTreeUtil(cacheAll2);
|
|
@@ -146,20 +145,26 @@ public class SysResourceServiceImpl extends IBaseServiceImpl<SysResourceEntity,
|
|
|
*/
|
|
|
|
|
|
private List<SysResourceEntity> findCacheAll(){
|
|
|
- return this.findAll();
|
|
|
+ List all = redisUtil.getJsonList(REDIS_RESOURCE_KEY, SysResourceEntity.class);
|
|
|
+ if (all == null) {
|
|
|
+ log.info("从数据库获取");
|
|
|
+ all = this.findAll();
|
|
|
+ // 21600-> 6h
|
|
|
+ redisUtil.setObjectToJson(REDIS_RESOURCE_KEY, all, 21600);
|
|
|
+ }
|
|
|
+ log.info("走缓存");
|
|
|
+ return all;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
private List<SysResourceEntity> findCacheAll2(){
|
|
|
- List<SysResourceEntity> all = new ArrayList<>();
|
|
|
- all = (List<SysResourceEntity> ) redisUtil.get(REDIS_RESOURCE_KEY);
|
|
|
-
|
|
|
+ List all = redisUtil.getJsonList(REDIS_RESOURCE_KEY, SysResourceEntity.class);
|
|
|
if (all == null) {
|
|
|
log.info("从数据库获取");
|
|
|
all = this.findAll();
|
|
|
// 21600-> 6h
|
|
|
- redisUtil.set(REDIS_RESOURCE_KEY, all, 21600);
|
|
|
+ redisUtil.setObjectToJson(REDIS_RESOURCE_KEY, all, 21600);
|
|
|
}
|
|
|
log.info("走缓存");
|
|
|
return all;
|