From af73409f431fb97eade82d34eff8c7b05e7fac92 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 14:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 2 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 0c6560a..ca755fe 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
@@ -27,11 +29,11 @@
/**
* 删除事件
- * @param eventDeleteDTO
+ * @param CommonEventDeleteDTO
* @return 平台用户信息
*/
@PostMapping("/event/delete")
- R delete(@RequestBody EventDeleteDTO eventDeleteDTO);
+ R delete(@RequestBody CommonEventDeleteDTO CommonEventDeleteDTO);
/**
* 查询事件详细信息
@@ -795,4 +797,99 @@
*/
@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 网格员统计信息
+ */
+ @PostMapping("/statistics/admin/gridMemberStatistics")
+ 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 网格统计数据
+ */
+ @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