添加分类查询返回组

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

@@ -26,4 +26,8 @@ public class SiteVo extends BaseEntityLong {
 
     private Integer areaLevel;
 
+    private Integer total =0;
+
+    private List<SiteEntity> subList=new ArrayList<>();
+
 }
\ No newline at end of file

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

@@ -257,11 +257,12 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     public String getFlatSitesGroupByAreaCode(@RequestBody SiteQuery site) {
         JSONObject jsonObject = new JSONObject();
         String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
+        List<SiteEntity> group = new ArrayList<>();
         Map<String, List<SiteEntity>> collect = new HashMap<>();
         try {
             if (ObjectUtils.isEmpty(site.getAreaName()) && ObjectUtils.isEmpty(site.getAreaCode())) {
                 List<SiteEntity> siteEntities = this.service.find(new SiteQuery());
-                collect = siteEntities.stream().collect(Collectors.groupingBy(SiteEntity::getAreaName));
+                collect = siteEntities.stream().collect(Collectors.groupingBy(SiteEntity::getAreaCode));
             } else {
                 if (!ObjectUtils.isEmpty(site.getSiteName())) {
                     List<SiteEntity> siteEntities = this.service.find(new SiteQuery().siteName(site.getSiteName()));
@@ -283,12 +284,22 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
                         .flatMap(areaCode -> this.service.getFlatSitesByAreaCode(areaCode, getContext()).stream())
                         .distinct()
                         .collect(Collectors.toList());
-                collect = siteEntityList.stream().collect(Collectors.groupingBy(x -> x.getAreaName()));
-
+                collect = siteEntityList.stream().collect(Collectors.groupingBy(x -> x.getAreaCode()));
             }
-            jsonObject.put(KEY_RESULT_DATA, collect);
+
+            group = collect.entrySet().stream().map(item -> {
+                AreaEntity areaEntity = areaService.getCache(item.getKey());
+                SiteEntity siteEntity = new SiteEntity();
+                siteEntity.setAreaName(areaEntity.getName());
+                siteEntity.setAreaCode(areaEntity.getAreaCode());
+                siteEntity.setSubList(item.getValue());
+                siteEntity.setTotal(item.getValue().size());
+                return siteEntity;
+            }).sorted(Comparator.comparing(SiteEntity::getAreaCode)).collect(Collectors.toList());
+
+            jsonObject.put(KEY_RESULT_DATA, group);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            jsonObject.put(KEY_RESULT_MSG, "查询站点列表成功！");
+            jsonObject.put(KEY_RESULT_MSG, "查询站点分组列表成功！");
 
             if (!ObjectUtils.isEmpty(getContext()) && !ObjectUtils.isEmpty(getContext().getUser())) {
                 recordSysLog(request, busiDesc + " 【成功】");
@@ -374,26 +385,39 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     public String getSitesGroupByAreaLevel(@RequestBody SiteQuery site) {
         JSONObject jsonObject = new JSONObject();
         String busiDesc = "根据区域等级查询当前区域所有站点" + this.getModuleDesc();
-        Map<String, List<SiteEntity>> collect = new HashMap<>();
-        try {
+        Map<Integer, List<SiteEntity>> collect = new HashMap<>();
+        List<SiteEntity> groupList = new ArrayList<>();
 
+        try {
             if (ObjectUtils.isEmpty(site.getAreaLevel())) {
                 //全部
                 for (int i = 1; i <= 5; i++) {
                     site.setAreaLevel(i);
                     Rest<List<SiteEntity>> rest = this.service.getAreaSitesByAreaLevel(site, getContext());
-                    String areaName = AreaLevelEnum.getByValue(i).getDesc();
-                    collect.put(areaName, rest.getData());
+                    // String areaName = AreaLevelEnum.getByValue(i).getDesc();
+                    collect.put(i, rest.getData());
                 }
             } else {
                 Rest<List<SiteEntity>> rest = this.service.getAreaSitesByAreaLevel(site, getContext());
                 if (YesNoEnum.YES.getValue() == rest.getCode()) {
-                    collect = rest.getData().stream().collect(Collectors.groupingBy(x -> x.getAreaName()));
+                    collect = rest.getData().stream().collect(Collectors.groupingBy(x -> x.getAreaLevel()));
                     jsonObject.put(KEY_RESULT_DATA, collect);
                 }
             }
+
+            //排序统计
+            for (int i = 1; i <= 5; i++) {
+                List<SiteEntity> siteEntities = collect.get(i);
+                SiteEntity siteEntity = new SiteEntity();
+                siteEntity.setAreaName(AreaLevelEnum.getByValue(i).getDesc());
+                if (!ObjectUtils.isEmpty(siteEntities)) {
+                    siteEntity.setTotal(siteEntities.size());
+                    siteEntity.setSubList(siteEntities);
+                }
+                groupList.add(siteEntity);
+            }
             recordSysLog(request, busiDesc + " 【成功】");
-            jsonObject.put(KEY_RESULT_DATA, collect);
+            jsonObject.put(KEY_RESULT_DATA, groupList);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功！");
         } catch (Exception e) {

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -128,16 +128,14 @@ Content-Type: application/json
 }
 
 
-###站点分组列表
+###站点区分组列表
 POST {{baseUrl}}/site/getFlatSitesGroupByAreaCode
 Content-Type: application/json
 
-{
-}
+{"areaName":"象鼻街道"}
 
-###站点分组列表
+###站点区域分组列表
 POST {{baseUrl}}/site/getSitesGroupByAreaLevel
 Content-Type: application/json
 
-{
-}
+{"areaLevel":2}