修改网关日志

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java

@@ -616,9 +616,6 @@ public class SiteEntity extends SiteVo {
         this.modelIds = modelIds;
     }
 
-
-
-
     @Override
     public int hashCode() {
         return this.getId().hashCode();

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

@@ -220,7 +220,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public List<SiteEntity> getFlatSitesByAreaCode(String areaCode, Context context) {
-        List<SiteEntity> siteList = new ArrayList<>();
         if (ObjectUtils.isEmpty(areaCode)) {
             throw new AppException("区域编码不能为空！");
         }
@@ -228,13 +227,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if (ObjectUtils.isEmpty(areaEntity)) {
             throw new AppException(String.format("区域不存在！区域编码：%s", areaCode));
         }
+        String matchCode = areaCode.replaceAll("(0)+$", "");
+        SiteQuery siteQuery = new SiteQuery();
+        siteQuery.setAreaCode(matchCode+"%");
+        List<SiteEntity> siteEntities = this.find(siteQuery);
 
-        List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
-        for (SiteEntity siteEntity : siteEntities) {
-            boolean bool = getSite(areaCode, siteEntity.getAreaCode(), siteList, siteEntity);
-            if (bool) continue;
-        }
-        return siteList;
+        //List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
+//        for (SiteEntity siteEntity : siteEntities) {
+//            boolean bool = getSite(areaCode, siteEntity.getAreaCode(), siteList, siteEntity);
+//            if (bool) continue;
+//        }
+        return siteEntities;
     }
 
     @Override
@@ -252,25 +255,31 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             throw new AppException(String.format("区域不存在！区域编码：%s", siteCache.getAreaCode()));
         }
 
-        List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
-        ;
-        for (SiteEntity siteEntity : siteEntities) {
-            boolean bool = getSite(siteCache.getAreaCode(), siteEntity.getAreaCode(), siteList, siteEntity);
-            if (bool) continue;
-
-        }
-        return siteList;
+        String matchCode = siteCache.getAreaCode().replaceAll("(0)+$", "");
+        SiteQuery siteQuery = new SiteQuery();
+        siteQuery.setAreaCode(matchCode+"%");
+        List<SiteEntity> siteEntities = this.find(siteQuery);
+//
+//        List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
+//        ;
+//        for (SiteEntity siteEntity : siteEntities) {
+//            boolean bool = getSite(siteCache.getAreaCode(), siteEntity.getAreaCode(), siteList, siteEntity);
+//            if (bool) continue;
+//
+//        }
+        return siteEntities;
     }
 
     private boolean getSite(String rootAreaCode, String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
         // AreaEntity areaTemp = areaService.getExtCache(siteEntity.getAreaCode());
         if (rootAreaCode.equals(areaCode)) {
             siteList.add(siteEntity);
-            log.info("add site:{}", siteEntity.getSiteCode());
+            //log.info("add site:{}", siteEntity.getSiteCode());
             return true;
         } else {
             AreaEntity areaTemp = areaService.getExtCache(areaCode);
             if (!ObjectUtils.isEmpty(areaTemp) && !ObjectUtils.isEmpty(areaTemp.getPid())) {
+                //根据子节点查找父节点
                 AreaEntity areaEntity = areaService.selectOne(new AreaQuery().iid(areaTemp.getPid()));
                 if (!ObjectUtils.isEmpty(areaEntity)) {
                     return getSite(rootAreaCode, areaEntity.getAreaCode(), siteList, siteEntity);

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

@@ -189,7 +189,7 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         int code=1;
         try {
             if(CollectionUtils.isNotEmpty(query.getAreaCodeList())){
-                List<SiteEntity> siteEntityList= query.getAreaCodeList().stream().flatMap(areaId ->
+                List<SiteEntity> siteEntityList= query.getAreaCodeList().parallelStream().flatMap(areaId ->
                         this.service.getFlatSitesByAreaCode(areaId, getContext()).stream()
                 ).distinct().collect(Collectors.toList());
                 model.put("data", siteEntityList);