From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
index 89e3dd9..bfe7875 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
@@ -104,9 +104,9 @@
*/
@ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
@GetMapping("lc/event/getGridMemberListByAreaIdOrName")
- public R getGridMemberListByAreaIdOrName(String areaId,String param) {
+ public R getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize) {
try {
- return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param));
+ return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param,pageNum,pageSize));
} catch (Exception e) {
log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
@@ -114,7 +114,26 @@
}
/**
- * description 获取指定区域网格列表
+ * description 获取指定区域网格列表,树形结构。不包括具体的网格数据。
+ *
+ * @param areaId 区域ID
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @ApiOperation(value = "获取指定区域网格树形列表，不包括具体的网格数据")
+ @GetMapping("lc/grid/tree")
+ public R getGridTreeByAreaId(String areaId) {
+ try {
+ return R.ok(lcApiService.getGridTreeByAreaId(areaId));
+ } catch (Exception e) {
+ log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
+ }
+ return R.ok(Collections.emptyList());
+ }
+
+ /**
+ * description 获取指定区域网格数据列表
*
* @param areaId 区域ID
* @return String 事件信息
@@ -123,16 +142,14 @@
*/
@ApiOperation(value = "获取指定区域网格列表")
@GetMapping("lc/grid/list")
- public R getGridListByAreaId(String areaId) {
+ public R getGridDataListByAreaId(String areaId) {
try {
- return R.ok(lcApiService.getGridListByAreaId(areaId));
+ return R.ok(lcApiService.getGridDataListByAreaId(areaId));
} catch (Exception e) {
log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
return R.ok(Collections.emptyList());
}
-
-
/**
* description 流动人口 走访详情
*
--
Gitblit v1.7.1