From eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 09:34:00 +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 |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 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 a653755..c013a8d 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
@@ -667,4 +667,36 @@
      */
     @PostMapping("/eventgriddata/getGridTodoData")
     R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO);
+
+    /**
+     * 后台获取网格员运动轨迹
+     * @param workTrajectoryDTO 请求参数
+     * @return  运动轨迹
+     */
+    @PostMapping("/map/gridMemberWorkTrajectory")
+    R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
+
+    /**
+     * 后台获取网格员预警记录
+     * @param gridMemberWainDTO 请求参数
+     * @return  预警记录
+     */
+    @PostMapping("/map/gridMemberWorkWarning")
+    R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO);
+
+    /**
+     * 分页查询网格
+     * @param eventGridDataDTO  请求参数
+     * @return  网格列表
+     */
+    @PostMapping("/eventgriddata/data/list")
+    R getGridDataList(PageEventGridDataDTO eventGridDataDTO);
+
+    /**
+     * 查询社区下所有网格员
+     * @param communityId   社区id
+     * @return  网格员列表
+     */
+    @PostMapping("/eventgriddata/member/list")
+    R getGridMemberLists(@RequestParam("communityId") Long communityId);
 }

--
Gitblit v1.7.1