Merge branch 'master' of http://218.59.175.43:3000/zhangzl/rongxin.api

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bigscreen/ResourceBigController.java

@@ -81,16 +81,16 @@ public class ResourceBigController extends BaseController {
     @GetMapping("/homepageStatistics")
     public AjaxResult homepageStatistics() {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-//        Object statisticVOMap = redisCache.getCacheObject(CacheConstants.BIG_DATA_RESOURCE_KEY+"homepageStatistics" + loginUser.getUser().getUserName());
-//        if (Objects.nonNull(statisticVOMap)) {
-//            return AjaxResult.success(statisticVOMap);
-//        }
+        Object statisticVOMap = redisCache.getCacheObject(CacheConstants.BIG_DATA_RESOURCE_KEY+"homepageStatistics" + loginUser.getUser().getUserName());
+        if (Objects.nonNull(statisticVOMap)) {
+            return AjaxResult.success(statisticVOMap);
+        }
         List<TBigDataScreen> list = tResourceLandService.progressResourceInvestigationStatistics(loginUser.getUser().getDeptId());//资源调查进度统计
         TBigDataScreen tBigDataScreen = tResourceLandService.homepageDownStatistics(loginUser.getUser().getDeptId());//首页下面统计
         Map map = new HashMap();
         map.put("progressResourceInvestigation",list);
         map.put("homepageStatistics",tBigDataScreen);
-//        redisCache.setCacheObject(CacheConstants.BIG_DATA_RESOURCE_KEY+"homepageStatistics" + loginUser.getUser().getUserName(), map, expireTime, TimeUnit.MINUTES);
+        redisCache.setCacheObject(CacheConstants.BIG_DATA_RESOURCE_KEY+"homepageStatistics" + loginUser.getUser().getUserName(), map, expireTime, TimeUnit.MINUTES);
         return AjaxResult.success(map);
     }