From 55427247b31582f5b6eda25dc811c48d3f9809e8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 17:41:38 +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 b55b1b2..d9b757d 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
@@ -823,6 +823,38 @@
     R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
 
     /**
+     * 批量删除
+     * @param eventDeleteDTO
+     * @return
+     */
+    @PostMapping("/event/deleteEventBatch")
+    R deleteEventBatch(@RequestBody EventDeleteDTO eventDeleteDTO);
+
+    /**
+     * 批量发布事件
+     * @param commonEventBatchRepublishDTO
+     * @return
+     */
+    @PostMapping("/event/batchRepublishEvent")
+    R batchRepublishEvent(@RequestBody CommonEventBatchRepublishDTO commonEventBatchRepublishDTO);
+
+    /**
+     * 批量事件标为无效
+     * @param eventBatchRevokeDTO
+     * @return
+     */
+    @PostMapping("/event/batchMarkInvalid")
+    R batchMarkEventInvalid(@RequestBody EventBatchRevokeDTO eventBatchRevokeDTO);
+
+    /**
+     * 批量事件标为无效
+     * @param pageEventGridNearbyDTO
+     * @return
+     */
+    @PostMapping("/event/grid/nearby")
+    R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO);
+
+    /**
      * 根据网格id查询网格统计数据
      * @param gridId    网格id
      * @return  网格统计数据

--
Gitblit v1.7.1