From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index 3cdfb87..562807f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -956,7 +956,7 @@
* @return 网格统计数据
*/
@PostMapping("/statistics/getGridEventStatistics")
- R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId);
+ R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId,@RequestParam("userId") Long userId);
/**
* 查询网格事件统计数据
@@ -1249,4 +1249,20 @@
*/
@PostMapping("/screen/getCivilDrawList")
R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);
+
+ /**
+ * 大屏-根据小区id查询小区统计人数
+ * @param villageId 小区id
+ * @return 小区统计数据
+ */
+ @GetMapping("/screen/village/statistics")
+ R civilVillageStatistics(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 查询所有网格员工作汇总数据
+ * @param statisticsAdminDTO 请求参数
+ * @return 网格员工作汇总数据
+ */
+ @PostMapping("/statistics/admin/gridMemberStatisticsAll")
+ R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
}
--
Gitblit v1.7.1