添加统计子站点

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

@@ -19,6 +19,7 @@ import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.base.system.valid.service.ValidCodeService;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.MenuEncodeUtil;
@@ -26,6 +27,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.access.model.AccessEntity;
 import com.mortals.xhx.module.access.model.AccessQuery;
+import com.mortals.xhx.module.access.model.AccessSystemEntity;
 import com.mortals.xhx.module.access.service.AccessService;
 import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
 import com.mortals.xhx.module.ph.model.PhQueueStatQuery;
@@ -50,6 +52,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
 import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@@ -139,8 +142,14 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             log.info("siteTreeStr:{}", siteTreeStr);
             //获取当前用户所拥有的站点列表
             AccessQuery accessQuery = new AccessQuery();
-            accessQuery.setTagNotList(Arrays.asList(""));
-            accessEntities = accessService.find(accessQuery);
+           // accessQuery.setTagNotList(Arrays.asList(""));
+            accessEntities = accessService.find(accessQuery).stream().filter(item -> {
+                List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
+                //判断排队机或者评价系统是否开通
+                List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
+                if(ObjectUtils.isEmpty(collect)){return false;}
+                return true;
+            }).collect(Collectors.toList());
 
             //  totalAccessSite = accessEntities.size();
             if (!ObjectUtils.isEmpty(accessEntities)) {

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

@@ -17,6 +17,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.access.model.AccessEntity;
 import com.mortals.xhx.module.access.model.AccessQuery;
 import com.mortals.xhx.module.access.model.AccessStatLogEntity;
+import com.mortals.xhx.module.access.model.AccessSystemEntity;
 import com.mortals.xhx.module.access.service.AccessService;
 import com.mortals.xhx.module.access.service.AccessStatLogService;
 import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
@@ -197,8 +198,15 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
 
     private List<SitePdu> getStatSiteList() {
         AccessQuery accessQuery = new AccessQuery();
-        accessQuery.setTagNotList(Arrays.asList(""));
+       // accessQuery.setTagNotList(Arrays.asList(""));
         List<AccessEntity> accessEntities = accessService.find(accessQuery);
+        accessEntities = accessEntities.stream().filter(item -> {
+            List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
+            //判断排队机或者评价系统是否开通
+            List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
+            if(ObjectUtils.isEmpty(collect)){return false;}
+            return true;
+        }).collect(Collectors.toList());
 
         List<SitePdu> sitePduList = new ArrayList<>();
         for (AccessEntity accessEntity : accessEntities) {
@@ -242,68 +250,9 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
 
         }
         int total = sitePduList.size();
-
-
-
-
-       /* 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) {
-                    updatePjSectionCache(site);
-                    updatePjWindowCache(site);
-                    updatePjHallNameCache(site);
-
-                    updatePhQueueBusniessCache(site);
-                    updatePhQueueSectionNameCache(site);
-                    updatePhQueueWindowsCache(site);
-                    updatePhQueueHallNameCache(site);
-                    total++;
-                }
-            }
-
-*//*            SitePdu site = new SitePdu();
-            site.setId(accessEntity.getSiteId());
-            site.setSiteName(accessEntity.getSiteName());
-            site.setSiteCode(accessEntity.getSiteCode());
-            site.setAreaCode(accessEntity.getAreaCode());
-
-            updatePjSectionCache(site);
-            updatePjWindowCache(site);
-            updatePjHallNameCache(site);
-
-            updatePhQueueBusniessCache(site);
-            updatePhQueueSectionNameCache(site);
-            updatePhQueueWindowsCache(site);
-            updatePhQueueHallNameCache(site);*//*
-        }*/
-
-
         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);
-        Rest<RespData<List<SitePdu>>> resp = siteFeign.list(sitePdu);
-        if (resp.getCode() == 1) {
-            List<SitePdu> sitePduList = resp.getData().getData();
-            for (SitePdu site : sitePduList) {
-                updatePjSectionCache(site);
-                updatePjWindowCache(site);
-                updatePjHallNameCache(site);
-
-                updatePhQueueBusniessCache(site);
-                updatePhQueueSectionNameCache(site);
-                updatePhQueueWindowsCache(site);
-                updatePhQueueHallNameCache(site);
-            }
-        }*/
     }
 
     private void updatePhQueueBusniessCache(SitePdu site) {

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

@@ -23,6 +23,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.access.model.AccessEntity;
 import com.mortals.xhx.module.access.model.AccessQuery;
 import com.mortals.xhx.module.access.model.AccessStatLogEntity;
+import com.mortals.xhx.module.access.model.AccessSystemEntity;
 import com.mortals.xhx.module.access.service.AccessService;
 import com.mortals.xhx.module.access.service.AccessStatLogService;
 import com.mortals.xhx.module.ph.model.PhQueueQuery;
@@ -194,8 +195,15 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                     log.info("计算天数区间：{}", compare);
 
                     AccessQuery accessQuery = new AccessQuery();
-                    accessQuery.setTagNotList(Arrays.asList(""));
-                    List<AccessEntity> accessEntities = accessService.find(accessQuery);
+                    //accessQuery.setTagNotList(Arrays.asList(""));
+                   // accessService.find(accessQuery);
+                    List<AccessEntity> accessEntities  = accessService.find(accessQuery).stream().filter(item -> {
+                        List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
+                        //判断排队机或者评价系统是否开通
+                        List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
+                        if(ObjectUtils.isEmpty(collect)){return false;}
+                        return true;
+                    }).collect(Collectors.toList());
 
                     List<SitePdu> sitePduList = new ArrayList<>();
                     for (AccessEntity accessEntity : accessEntities) {

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

@@ -18,6 +18,7 @@ import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.access.model.AccessEntity;
 import com.mortals.xhx.module.access.model.AccessQuery;
 import com.mortals.xhx.module.access.model.AccessStatLogEntity;
+import com.mortals.xhx.module.access.model.AccessSystemEntity;
 import com.mortals.xhx.module.access.service.AccessService;
 import com.mortals.xhx.module.access.service.AccessStatLogService;
 import com.mortals.xhx.module.pj.model.PjEvaluateQuery;
@@ -192,8 +193,16 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                     log.info("计算天数区间：{}", compare);
 
                     AccessQuery accessQuery = new AccessQuery();
-                    accessQuery.setTagNotList(Arrays.asList(""));
-                    List<AccessEntity> accessEntities = accessService.find(accessQuery);
+//                    accessQuery.setTagNotList(Arrays.asList(""));
+//                    List<AccessEntity> accessEntities = accessService.find(accessQuery);
+
+                    List<AccessEntity> accessEntities = accessService.find(accessQuery).stream().filter(item -> {
+                        List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
+                        //判断排队机或者评价系统是否开通
+                        List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
+                        if(ObjectUtils.isEmpty(collect)){return false;}
+                        return true;
+                    }).collect(Collectors.toList());
 
                     List<SitePdu> sitePduList=new ArrayList<>();
                     for (AccessEntity accessEntity : accessEntities) {

bill-manager/src/main/java/com/mortals/xhx/module/stat/web/StatController.java

@@ -14,6 +14,7 @@ import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.access.model.AccessEntity;
 import com.mortals.xhx.module.access.model.AccessQuery;
+import com.mortals.xhx.module.access.model.AccessSystemEntity;
 import com.mortals.xhx.module.access.service.AccessService;
 import com.mortals.xhx.module.access.service.AccessStatLogService;
 import com.mortals.xhx.module.pj.model.PjEvaluateQuery;
@@ -105,8 +106,16 @@ public class StatController extends BaseCRUDJsonBodyMappingController<StatServic
                     log.info("计算天数区间：{}", compare);
 
                     AccessQuery accessQuery = new AccessQuery();
-                    accessQuery.setTagNotList(Arrays.asList(""));
-                    List<AccessEntity> accessEntities = accessService.find(accessQuery);
+              /*      accessQuery.setTagNotList(Arrays.asList(""));
+                    List<AccessEntity> accessEntities = accessService.find(accessQuery);*/
+
+                    List<AccessEntity> accessEntities  = accessService.find(accessQuery).stream().filter(item -> {
+                        List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
+                        //判断排队机或者评价系统是否开通
+                        List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
+                        if(ObjectUtils.isEmpty(collect)){return false;}
+                        return true;
+                    }).collect(Collectors.toList());
 
                     List<SitePdu> sitePduList = new ArrayList<>();
                     for (AccessEntity accessEntity : accessEntities) {