添加区域点击

common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java

@@ -85,8 +85,8 @@ public interface ISiteFeign extends IFeign {
      * @param sitePdu
      * @return
      */
-    @PostMapping(value = "/site/getFlatSitesByAreaIds")
-    String getFlatSitesByAreaIds(@RequestBody SitePdu sitePdu);
+    @PostMapping(value = "/site/getFlatSitesByAreaCode")
+    Rest<List<SitePdu>> getFlatSitesByAreaIds(@RequestBody SitePdu sitePdu);
 
 
 
@@ -131,8 +131,8 @@ class SiteFeignFallbackFactory implements FallbackFactory<ISiteFeign> {
             }
 
             @Override
-            public String getFlatSitesByAreaIds(SitePdu sitePdu) {
-                return JSON.toJSONString(Rest.fail("暂时无法获取站点子站点，请稍后再试!"));
+            public Rest<List<SitePdu>> getFlatSitesByAreaIds(SitePdu sitePdu) {
+                return Rest.fail("暂时无法获取站点子站点，请稍后再试!");
             }
         };
     }

device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java

@@ -2,7 +2,6 @@ package com.mortals.xhx.module.sitestat.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -71,7 +70,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
     public Result<SitestatEntity> find(SitestatEntity entity, PageInfo pageInfo, Context context) throws AppException {
         Result<SitestatEntity> res = new Result<>();
         //根据站点查询所以站点子集列表
-        Result<SitestatEntity> sitestatsAreaResult = getSitestatEntityResultByArea(entity, pageInfo, context, res);
+        Result<SitestatEntity> sitestatsAreaResult = getSitestatEntityResultByArea(entity, pageInfo,context, res);
         if (sitestatsAreaResult != null) return sitestatsAreaResult;
 
         Result<SitestatEntity> sitestatsResult = getSitestatsResult(entity, pageInfo, res);
@@ -86,7 +85,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
         if (ObjectUtils.isEmpty(entity.getSiteId())) return null;
         if (platFormType.equalsIgnoreCase(PlatformTypeEnum.STANDALONE.getValue())) {
             //根据返回的id 筛选列表
-            Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x -> x.getSiteId(), y -> y, (o, n) -> n));
+            Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x->x.getSiteId(),y->y,(o,n)->n));
             List<SitestatEntity> list = this.siteService.find(new SiteQuery().id(entity.getSiteId())).stream().filter(f -> collectMap.containsKey(f.getId())).map(m -> collectMap.get(m.getId())).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(entity.getSiteName())) {
                 list = MemoryPagination.search(entity.getSiteName(), list);
@@ -99,15 +98,15 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
             SitePdu sitePdu = new SitePdu();
             sitePdu.setId(entity.getSiteId());
             Rest<List<SitePdu>> result = siteFeign.getFlatSitesBySiteId(sitePdu);
-            // log.info("siteList:{}",JSON.toJSONString(result));
+           // log.info("siteList:{}",JSON.toJSONString(result));
             if (result.getCode() == YesNoEnum.YES.getValue()) {
                 //根据返回的id 筛选列表
-                Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x -> x.getSiteId(), y -> y, (o, n) -> n));
+                Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x->x.getSiteId(),y->y,(o,n)->n));
                 List<SitestatEntity> list = result.getData().stream().filter(f -> collectMap.containsKey(f.getId())).map(m -> collectMap.get(m.getId())).collect(Collectors.toList());
                 if (!ObjectUtils.isEmpty(entity.getSiteName())) {
                     list = MemoryPagination.search(entity.getSiteName(), list);
                 }
-                // log.info("siteStatList:{}",JSON.toJSONString(list));
+               // log.info("siteStatList:{}",JSON.toJSONString(list));
                 pageInfo.setTotalResult(list.size());
                 List<SitestatEntity> siteStatList = MemoryPagination.pagination(list, pageInfo.getCurrPage(), pageInfo.getPrePageResult());
                 res.setList(siteStatList);
@@ -186,7 +185,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
         if (ObjectUtils.isEmpty(entity.getAreaCode())) return null;
         if (platFormType.equalsIgnoreCase(PlatformTypeEnum.STANDALONE.getValue())) {
             //根据返回的id 筛选列表 todo
-            Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x -> x.getSiteId(), y -> y, (o, n) -> n));
+            Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x->x.getSiteId(),y->y,(o,n)->n));
             List<SitestatEntity> list = this.siteService.find(new SiteQuery().id(entity.getSiteId())).stream().filter(f -> collectMap.containsKey(f.getId())).map(m -> collectMap.get(m.getId())).collect(Collectors.toList());
             if (!ObjectUtils.isEmpty(entity.getSiteName())) {
                 list = MemoryPagination.search(entity.getSiteName(), list);
@@ -200,20 +199,16 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
             List<String> areaCodeList = new ArrayList<>();
             areaCodeList.add(entity.getAreaCode());
             sitePdu.setAreaCodeList(areaCodeList);
-            String resp = siteFeign.getFlatSitesByAreaIds(sitePdu);
-            log.info("areaSiteList:{}", JSON.toJSONString(resp));
-
-            Rest<List<SitePdu>> result = JSON.parseObject(resp, new TypeReference<Rest<List<SitePdu>>>() {
-            });
-
+            Rest<List<SitePdu>> result = siteFeign.getFlatSitesByAreaIds(sitePdu);
+             log.info("areaSiteList:{}",JSON.toJSONString(result));
             if (result.getCode() == YesNoEnum.YES.getValue()) {
                 //根据返回的id 筛选列表
-                Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x -> x.getSiteId(), y -> y, (o, n) -> n));
+                Map<Long, SitestatEntity> collectMap = this.find(new SitestatEntity(), context).stream().collect(Collectors.toMap(x->x.getSiteId(),y->y,(o,n)->n));
                 List<SitestatEntity> list = result.getData().stream().filter(f -> collectMap.containsKey(f.getId())).map(m -> collectMap.get(m.getId())).collect(Collectors.toList());
                 if (!ObjectUtils.isEmpty(entity.getSiteName())) {
                     list = MemoryPagination.search(entity.getSiteName(), list);
                 }
-                //  log.info("siteStatList:{}",JSON.toJSONString(list));
+               //  log.info("siteStatList:{}",JSON.toJSONString(list));
                 pageInfo.setTotalResult(list.size());
                 List<SitestatEntity> siteStatList = MemoryPagination.pagination(list, pageInfo.getCurrPage(), pageInfo.getPrePageResult());
                 res.setList(siteStatList);