From 95f40a20c7beb789b19256848277c204e3b252e9 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 14:11:13 +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 |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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 d4a6152..50a756a 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
@@ -6,6 +6,8 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *
  * @author cedoo email:cedoo(a)qq.com
@@ -622,6 +624,15 @@
     R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
 
     /**
+     * 分页查询宣传教育事件
+     * @param pagePublicityEventDTO   请求参数
+     * @return  结果
+     */
+    @PostMapping("/event/queryPublicityCommunity")
+    R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO);
+
+
+    /**
      * 分页查询社区列表
      * @return  结果
      */
@@ -770,4 +781,20 @@
      */
     @PostMapping("/easy/admin/publicity")
     R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);
+
+    /**
+     * 后台管理-统计模块
+     * @param communityId   社区id
+     * @return  统计信息
+     */
+    @GetMapping("/statistics/admin/eventStatistics")
+    R eventStatistics(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 后台管理-删除网格
+     * @param Ids   网格id集合
+     * @return  删除结果
+     */
+    @PostMapping("/eventgriddata/data/delete")
+    R deleteGridData(@RequestBody List<Long> Ids);
 }

--
Gitblit v1.7.1