From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 f532a50..605f0d6 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
@@ -24,6 +24,7 @@
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.serviceapi.biz.LcApiService;
import com.panzhihua.serviceapi.model.dto.*;
import lombok.extern.slf4j.Slf4j;
@@ -150,8 +151,18 @@
}
@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();
@@ -159,12 +170,18 @@
}
@Override
- public String getGridMemberListByAreaIdOrName(String areaId) {
+ public List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize) {
HttpRequest request = HttpUtil.createGet(LcApiConstants.GRID_GET_GETALL_SEARCH_PAGE_URL);
request.auth(getAuthToken());
request.form("areaId", areaId);
+ request.form("limit", pageSize);
+ request.form("page", pageNum);
+ if(StringUtils.isNotEmpty(param)){
+ request.form("param", param);
+ }
HttpResponse result = request.execute();
- return result.body();
+ LcReturnObject returenData = JSONObject.parseObject(result.body(), LcReturnObject.class);
+ return JSONArray.parseArray(returenData.getData(), GridMemberPageListDTO.class);
}
@Override
--
Gitblit v1.7.1