添加统计子站点

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

@@ -8,6 +8,7 @@ import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.common.code.AccessTypeEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.keys.RedisCacheKeys;
 import com.mortals.xhx.common.pdu.RespData;
@@ -81,7 +82,25 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
         List<AccessEntity> accessEntities = accessService.find(accessQuery);
 
         for (AccessEntity accessEntity : accessEntities) {
-            SitePdu site = new SitePdu();
+
+            SitePdu sitePdu = new SitePdu();
+            sitePdu.setId(accessEntity.getId());
+            Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+            if(YesNoEnum.YES.getValue()==sitesRest.getCode()){
+                List<SitePdu> sitePduList = sitesRest.getData();
+                for (SitePdu site : sitePduList) {
+                    updatePjSectionCache(site);
+                    updatePjWindowCache(site);
+                    updatePjHallNameCache(site);
+
+                    updatePhQueueBusniessCache(site);
+                    updatePhQueueSectionNameCache(site);
+                    updatePhQueueWindowsCache(site);
+                    updatePhQueueHallNameCache(site);
+                }
+            }
+
+/*            SitePdu site = new SitePdu();
             site.setId(accessEntity.getSiteId());
             site.setSiteName(accessEntity.getSiteName());
             site.setSiteCode(accessEntity.getSiteCode());
@@ -94,7 +113,7 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
             updatePhQueueBusniessCache(site);
             updatePhQueueSectionNameCache(site);
             updatePhQueueWindowsCache(site);
-            updatePhQueueHallNameCache(site);
+            updatePhQueueHallNameCache(site);*/
         }
 
 

bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueStatController.java

@@ -14,6 +14,7 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.AccessTypeEnum;
 import com.mortals.xhx.common.code.GroupListEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
@@ -186,19 +187,28 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                     StopWatch stopWatch = new StopWatch();
                     log.info("计算天数区间：{}", compare);
 
-
-
                     AccessQuery accessQuery = new AccessQuery();
                     accessQuery.setTagNotList(Arrays.asList(""));
                     List<AccessEntity> accessEntities = accessService.find(accessQuery);
 
                     for (AccessEntity accessEntity : accessEntities) {
+                        //根据当前站点获取子站点
+                        SitePdu sitePdu = new SitePdu();
+                        sitePdu.setId(accessEntity.getId());
+                        Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+                        if(YesNoEnum.YES.getValue()==sitesRest.getCode()){
+                            List<SitePdu> sitePduList = sitesRest.getData();
+                            for (SitePdu site : sitePduList) {
+                                updateSitePhStat(attendStart, compare, stopWatch, site, context);
+                            }
+                        }
+/*
                         SitePdu site = new SitePdu();
                         site.setId(accessEntity.getSiteId());
                         site.setSiteName(accessEntity.getSiteName());
                         site.setSiteCode(accessEntity.getSiteCode());
                         site.setAreaCode(accessEntity.getAreaCode());
-                        updateSitePhStat(attendStart, compare, stopWatch, site, context);
+                        updateSitePhStat(attendStart, compare, stopWatch, site, context);*/
                     }
 
 /*                    SitePdu sitePdu = new SitePdu();

bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateStatController.java

@@ -192,13 +192,26 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                     List<AccessEntity> accessEntities = accessService.find(accessQuery);
 
                     for (AccessEntity accessEntity : accessEntities) {
+                        //根据当前站点获取子站点
+                        SitePdu sitePdu = new SitePdu();
+                        sitePdu.setId(accessEntity.getId());
+                        Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+                        if(YesNoEnum.YES.getValue()==sitesRest.getCode()){
+                            List<SitePdu> sitePduList = sitesRest.getData();
+                            for (SitePdu site : sitePduList) {
+                                updateSitePjStat(attendStart, compare, stopWatch, site, context);
+                            }
+                        }
+                    }
+
+/*                    for (AccessEntity accessEntity : accessEntities) {
                         SitePdu site = new SitePdu();
                         site.setId(accessEntity.getSiteId());
                         site.setSiteName(accessEntity.getSiteName());
                         site.setSiteCode(accessEntity.getSiteCode());
                         site.setAreaCode(accessEntity.getAreaCode());
                         updateSitePjStat(attendStart, compare, stopWatch, site, context);
-                    }
+                    }*/
 
               /*      SitePdu sitePdu = new SitePdu();
                     sitePdu.setSize(-1);

bill-manager/src/test/java/com/mortals/httpclient/system.http

@@ -47,7 +47,7 @@ POST {{baseUrl}}/pj/evaluate/stat/stat
 Content-Type: application/json
 
 {
-  "pjTimeStart": "2023-01-01",
+  "pjTimeStart": "2024-01-01",
   "pjTimeEnd": "2024-07-26"
 }
 
@@ -56,7 +56,7 @@ POST {{baseUrl}}/ph/queue/stat/stat
 Content-Type: application/json
 
 {
-  "taketimeStart": "2023-01-01",
+  "taketimeStart": "2024-01-01",
   "taketimeEnd": "2024-07-26"
 }
 
@@ -67,7 +67,7 @@ Content-Type: application/json
 
 {
   "createTimeStart": "2024-01-01",
-  "createTimeEnd": "2024-07-15"
+  "createTimeEnd": "2024-07-26"
 }