From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +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 | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 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 e85c05d..72bf612 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 结果
*/
@@ -689,7 +700,7 @@
* @return 网格列表
*/
@PostMapping("/eventgriddata/data/list")
- R getGridDataList(@RequestBody PageEventGridDataDTO eventGridDataDTO);
+ R getGridDataList(@RequestBody PageEventGridDataAdminDTO eventGridDataDTO);
/**
* 查询社区下所有网格员
@@ -722,4 +733,92 @@
*/
@PostMapping("/event/republishInvalid")
R republishInvalidEvent(@RequestBody CommonEventRepublishDTO commonEventRepublishDTO);
+
+ /**
+ * 后台新增网格
+ * @param eventGridDataDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/eventgriddata/data/add")
+ R addGridDataByAdmin(@RequestBody EventGridDataAddAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台修改网格
+ * @param eventGridDataDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/eventgriddata/data/edit")
+ R editGridDataByAdmin(@RequestBody EventGridDataEditAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台管理-分页查询随手拍列表
+ * @param easyAppDTO 请求参数
+ * @return 随手拍列表
+ */
+ @PostMapping("/easy/admin/list")
+ R easyListByAdmin(@RequestBody PageEasyAdminDTO easyAppDTO);
+
+ /**
+ * 后台管理-随手拍详情
+ * @param easyId 随手拍id
+ * @return 随手拍详情
+ */
+ @PostMapping("/easy/admin/detail")
+ R easyDetailByAdmin(@RequestParam("easyId") Long easyId);
+
+ /**
+ * 后台管理-随手拍处理
+ * @param photoHandleDTO 请求参数
+ * @return 处理结果
+ */
+ @PostMapping("/easy/admin/handle")
+ R easyHandleByAdmin(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO);
+
+ /**
+ * 后台管理-批量修改随手拍公示状态/删除随手拍
+ * @param photoHandleDTO 请求参数
+ * @return 修改/删除结果
+ */
+ @PostMapping("/easy/admin/publicity")
+ R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);
+
+ /**
+ * 查询网格下所有网格员
+ * @param gridId
+ * @return
+ */
+ @PostMapping("/eventgriddata/grid/member")
+ R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);
+
+ /**
+ * 查询网格下所有网格员
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eventgriddata/communitygrid")
+ R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);
+
+ /**
+ * 后台管理-统计模块
+ * @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);
+
+ /**
+ * 后台管理-网格员统计
+ * @param statisticsAdminDTO 请求参数
+ * @return 网格员统计信息
+ */
+ @GetMapping("/statistics/admin/gridMemberStatistics")
+ R gridMemberStatistics(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
}
--
Gitblit v1.7.1