添加文档接口设备统计

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -496,11 +496,16 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
      */
     @Override
     public Rest<List<SiteEntity>> getAreaSitesByAreaLevel(SiteQuery query, Context context) {
+        if (!ObjectUtils.isEmpty(query.getSiteName())) {
+            SiteEntity siteEntity = this.selectOne(new SiteQuery().siteName(query.getSiteName()));
+            if (!ObjectUtils.isEmpty(siteEntity)) {
+                query.setAreaLevel(siteEntity.getAreaLevel());
+            }
+        }
        //获取所有层级的区域
         List<AreaEntity> areaEntities = areaService.find(new AreaQuery().areaLevel(query.getAreaLevel()));
 
         List<SiteEntity> list = new ArrayList<>();
-
         for (AreaEntity areaEntity : areaEntities) {
             List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
 

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -158,14 +158,23 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         JSONObject jsonObject = new JSONObject();
         String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
         try {
-//            AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
-//            if(!ObjectUtils.isEmpty(areaEntity)){
-//                site.setAreaCode(areaEntity.getAreaCode());
-//            }
+            if (!ObjectUtils.isEmpty(site.getSiteName())) {
+                SiteEntity siteEntity = this.service.selectOne(new SiteQuery().siteName(site.getSiteName()));
+                if (!ObjectUtils.isEmpty(siteEntity)) {
+                    site.setAreaCode(siteEntity.getAreaCode());
+                }
+            }
+            if (!ObjectUtils.isEmpty(site.getAreaName())) {
+                AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
+                if (!ObjectUtils.isEmpty(areaEntity)) {
+                    site.setAreaCode(areaEntity.getAreaCode());
+                }
+            }
+
             List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
 
-            if(!ObjectUtils.isEmpty(site.getSiteName())){
-                siteEntityList=siteEntityList.stream().filter(item->site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(site.getSiteName())) {
+                siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());
             }
 
             recordSysLog(request, busiDesc + " 【成功】");