添加统计子站点

bill-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -130,7 +130,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         ret.put("resources", urls);
 
         //todo  首页统计报表
-        int totalAccessSite = 0;
+        //    int totalAccessSite = 0;
         List<AccessEntity> accessEntities = new ArrayList<>();
         RedisTemplate<String, String> baseRedisTemplate = cacheService.selectDbRedisTemplate(1);
         //com:mortals:xhx:module:site:model:SiteEntity  redis调用
@@ -142,7 +142,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             accessQuery.setTagNotList(Arrays.asList(""));
             accessEntities = accessService.find(accessQuery);
 
-            totalAccessSite = accessEntities.size();
+            //  totalAccessSite = accessEntities.size();
             if (!ObjectUtils.isEmpty(accessEntities)) {
                 //当前用户存在的区域或者站点列表
                 //遍历 如果不存在 正则
@@ -163,13 +163,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
                     } else {
                         log.info("未知类型节点，不做过滤！");
                     }
-
                 }
-
             }
         }
         data.put("accessList", accessEntities);
-        data.put("totalAccessSite", totalAccessSite);
+        String totalAccessSite = cacheService.get(RedisKey.KEY_SITE_STAT_COUNT_CHCHE);
+        String lastStatUpdateTime = cacheService.get(RedisKey.KEY_SITE_STAT_TIME_CHCHE);
+        data.put("totalAccessSite", totalAccessSite == null ? 10 : Integer.parseInt(totalAccessSite));
+        data.put("lastStatUpdateTime", lastStatUpdateTime == null ? DateUtil.formatDateTime(new Date()) : lastStatUpdateTime);
         int totalCount = 0;
         StatQuery statQuery = new StatQuery();
         statQuery.setGroupList(Arrays.asList("year"));
@@ -181,13 +182,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
 
         }
         data.put("totalCount", totalCount);
-
         //近三十天数据总量趋势
         getThirtyStats(data);
         getThirtyPhStats(data);
         getThirtyPjStats(data);
 
-
         return ret.toJSONString();
     }
 
@@ -202,7 +201,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         if (!ObjectUtils.isEmpty(thirtyStatList)) {
             //todo 日期排序趋势降序图
             data.put("thirtyStatList", thirtyStatList);
-        }else{
+        } else {
             data.put("thirtyStatList", new ArrayList<>());
         }
     }
@@ -222,7 +221,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         if (!ObjectUtils.isEmpty(thirtyStatList)) {
             //todo 日期排序趋势降序图
             data.put("thirtyPhStatList", thirtyStatList);
-        }else{
+        } else {
             data.put("thirtyPhStatList", new ArrayList<>());
         }
     }
@@ -233,7 +232,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         PjEvaluateStatQuery statThirtyQuery = new PjEvaluateStatQuery();
         statThirtyQuery.setTimeStart(DateUtil.offsetDay(new Date(), -30).toDateStr());
         statThirtyQuery.setTimeEnd(DateUtil.today());
-        log.info(statThirtyQuery.getTimeStart()+"---"+statThirtyQuery.getTimeEnd());
+        log.info(statThirtyQuery.getTimeStart() + "---" + statThirtyQuery.getTimeEnd());
 
         statThirtyQuery.setHallNameList(Arrays.asList(""));
         statThirtyQuery.setWindowFromnumList(Arrays.asList(""));
@@ -245,7 +244,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         if (!ObjectUtils.isEmpty(thirtyStatList)) {
             //todo 日期排序趋势降序图
             data.put("thirtyPjStatList", thirtyStatList);
-        }else {
+        } else {
             data.put("thirtyPjStatList", new ArrayList<>());
         }
     }

bill-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java

@@ -44,4 +44,14 @@ public class RedisKey {
      */
     public static final String KEY_SITE_PJ_HALLNAME_CHCHE = "site:pj:hallname:";
 
+    /**
+     *  统计累计接入站点
+     */
+    public static final String KEY_SITE_STAT_COUNT_CHCHE = "site:stat:count:";
+
+    /**
+     *  最后统计时间
+     */
+    public static final String KEY_SITE_STAT_TIME_CHCHE = "site:stat:time:";
+
 }

bill-manager/src/main/java/com/mortals/xhx/daemon/task/SiteStatTaskImpl.java

@@ -81,6 +81,8 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
         accessQuery.setTagNotList(Arrays.asList(""));
         List<AccessEntity> accessEntities = accessService.find(accessQuery);
 
+        int total=0;
+
         for (AccessEntity accessEntity : accessEntities) {
 
             SitePdu sitePdu = new SitePdu();
@@ -97,6 +99,7 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
                     updatePhQueueSectionNameCache(site);
                     updatePhQueueWindowsCache(site);
                     updatePhQueueHallNameCache(site);
+                    total++;
                 }
             }
 
@@ -117,6 +120,10 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
         }
 
 
+        cacheService.set(RedisKey.KEY_SITE_STAT_COUNT_CHCHE,total);
+        cacheService.set(RedisKey.KEY_SITE_STAT_TIME_CHCHE,DateUtil.formatDateTime(new Date()));
+
+
 
 /*        SitePdu sitePdu = new SitePdu();
         sitePdu.setSize(-1);