From 94eff0af33206a9dded2e5632add4befb809c89e Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 07 六月 2021 16:52:50 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 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 72bf612..9d55c2d 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
@@ -819,6 +819,30 @@
      * @param statisticsAdminDTO    请求参数
      * @return  网格员统计信息
      */
-    @GetMapping("/statistics/admin/gridMemberStatistics")
+    @PostMapping("/statistics/admin/gridMemberStatistics")
     R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
+
+    /**
+     * 根据网格id查询网格统计数据
+     * @param gridId    网格id
+     * @return  网格统计数据
+     */
+    @PostMapping("/statistics/getGridEventStatistics")
+    R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId);
+
+    /**
+     * 查询网格事件统计数据
+     * @param statisticsDTO 请求参数
+     * @return  网格事件统计数据
+     */
+    @PostMapping("/statistics/event/getGridEventStatistics")
+    R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO);
+
+    /**
+     * 网格员上报地理位置
+     * @param memberPositionDTO 请求参数
+     * @return  上报结果
+     */
+    @PostMapping("/eventgridmembergpslog/add")
+    R gridReportPosition(@RequestBody GridMemberPositionDTO memberPositionDTO);
 }

--
Gitblit v1.7.1