From 098b507166a2b23f0256d5c4f097e7f05f11e9be Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 09:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
index 3fa78ad..5e08768 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java
@@ -150,10 +150,20 @@
     }
 
     @Override
-    public List<LcGridData> getGridListByAreaId(String areaId) {
+    public List<LcGridData> getGridTreeByAreaId(String areaId) {
         HttpRequest request = HttpUtil.createPost(LcApiConstants.GRID_GET_EVENT_INFO_AREA_ID_URL);
         request.auth(getAuthToken());
         request.form("areaId", areaId);
+        request.form("level", 4);
+        HttpResponse result = request.execute();
+        return JSONArray.parseArray(result.body(), LcGridData.class);
+    }
+
+    @Override
+    public List<LcGridData> getGridDataListByAreaId(String areaId) {
+        HttpRequest request = HttpUtil.createPost(LcApiConstants.GRID_GET_GRID_DATA_AREA_ID_URL);
+        request.auth(getAuthToken());
+        request.form("areaId", areaId);
         HttpResponse result = request.execute();
         return JSONArray.parseArray(result.body(), LcGridData.class);
     }

--
Gitblit v1.7.1