添加统计子站点

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

@@ -202,8 +202,17 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
 
         List<SitePdu> sitePduList = new ArrayList<>();
         for (AccessEntity accessEntity : accessEntities) {
+            if(accessEntity.getSiteId()==1L){
+                SitePdu site = new SitePdu();
+                site.setId(accessEntity.getSiteId());
+                site.setSiteName(accessEntity.getSiteName());
+                site.setSiteCode(accessEntity.getSiteCode());
+                site.setAreaCode(accessEntity.getAreaCode());
+                sitePduList.add(site);
+                continue;
+            }
             SitePdu sitePdu = new SitePdu();
-            sitePdu.setId(accessEntity.getId());
+            sitePdu.setId(accessEntity.getSiteId());
             Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
             if (YesNoEnum.YES.getValue() == sitesRest.getCode()) {
                 sitePduList.addAll(sitesRest.getData());

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

@@ -199,8 +199,19 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
 
                     List<SitePdu> sitePduList = new ArrayList<>();
                     for (AccessEntity accessEntity : accessEntities) {
+
+                        if(accessEntity.getSiteId()==1L){
+                            SitePdu site = new SitePdu();
+                            site.setId(accessEntity.getSiteId());
+                            site.setSiteName(accessEntity.getSiteName());
+                            site.setSiteCode(accessEntity.getSiteCode());
+                            site.setAreaCode(accessEntity.getAreaCode());
+                            sitePduList.add(site);
+                            continue;
+                        }
+
                         SitePdu sitePdu = new SitePdu();
-                        sitePdu.setId(accessEntity.getId());
+                        sitePdu.setId(accessEntity.getSiteId());
                         Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
                         if (YesNoEnum.YES.getValue() == sitesRest.getCode()) {
                             sitePduList.addAll(sitesRest.getData());

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

@@ -197,8 +197,18 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
 
                     List<SitePdu> sitePduList=new ArrayList<>();
                     for (AccessEntity accessEntity : accessEntities) {
+
+                        if(accessEntity.getSiteId()==1L){
+                            SitePdu site = new SitePdu();
+                            site.setId(accessEntity.getSiteId());
+                            site.setSiteName(accessEntity.getSiteName());
+                            site.setSiteCode(accessEntity.getSiteCode());
+                            site.setAreaCode(accessEntity.getAreaCode());
+                            sitePduList.add(site);
+                            continue;
+                        }
                         SitePdu sitePdu = new SitePdu();
-                        sitePdu.setId(accessEntity.getId());
+                        sitePdu.setId(accessEntity.getSiteId());
                         Rest<List<SitePdu>> sitesRest = siteFeign.getFlatSitesBySiteId(sitePdu);
                         if(YesNoEnum.YES.getValue()==sitesRest.getCode()){
                             sitePduList.addAll(sitesRest.getData());