From 62c0d18b76729935c6a1b30efa83452a32d02c83 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 20:03:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 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 8b20712..3848f97 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
@@ -853,4 +853,43 @@
      */
     @PostMapping("/event/grid/nearby")
     R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO);
+
+    /**
+     * 根据网格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);
+
+    /**
+     * 直接上报社区
+     * @param commonEventDirectReportDTO
+     * @return
+     */
+    @PostMapping("/event/reportDirect")
+    R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO);
+
+    /**
+     * 定时任务扫描网格员工作状态
+     * @return  定时任务扫描结果
+     */
+    @PostMapping("/eventgridmemberwarnlog/judge")
+    R timedTaskGridMember();
 }

--
Gitblit v1.7.1