From 6fb866218f53e1cf2c8c108c5aefc2a6a9e19c80 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期四, 17 六月 2021 17:55:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
index 9edde3a..ad0caa8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
@@ -46,8 +46,17 @@
@PostMapping("/delete")
R delete(@RequestBody CommonEventDeleteDTO commonEventDeleteDTO){
return eventService.delete(commonEventDeleteDTO);
- };
+ }
+ /**
+ * 批量删除
+ * @param eventDeleteDTO
+ * @return
+ */
+ @PostMapping("/deleteEventBatch")
+ R deleteEventBatch(@RequestBody EventDeleteDTO eventDeleteDTO){
+ return eventService.deleteEventBatch(eventDeleteDTO);
+ }
/**
* 查询事件详细信息
* @param id 事件 id
@@ -56,7 +65,7 @@
@PostMapping("/{id}")
R<EventDetailsVO> eventDetails(@PathVariable("id") Long id){
return eventService.eventDetails(id);
- };
+ }
/**
* 添加突发事件
@@ -66,7 +75,7 @@
@PostMapping("/addCommon")
R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
return eventService.addCommon(commonEventAddDTO);
- };
+ }
/**
* 保存草稿
* @param {classNameFirstLower}AddDTO 添加事件传递对象
@@ -135,6 +144,15 @@
return eventService.republishEvent(commonEventRepublishDTO);
}
+ /**
+ * 批量发布事件
+ * @param commonEventBatchRepublishDTO
+ * @return
+ */
+ @PostMapping("/batchRepublishEvent")
+ R batchRepublishEvent(@RequestBody CommonEventBatchRepublishDTO commonEventBatchRepublishDTO){
+ return eventService.batchRepublishEvent(commonEventBatchRepublishDTO);
+ }
/**
* 草稿发布
* @param commonEventPublicDTO
@@ -246,6 +264,16 @@
}
/**
+ * 批量事件标为无效
+ * @param eventBatchRevokeDTO
+ * @return
+ */
+ @PostMapping("/batchMarkInvalid")
+ R batchMarkEventInvalid(@RequestBody EventBatchRevokeDTO eventBatchRevokeDTO){
+ return eventService.batchMarkEventInvalid(eventBatchRevokeDTO);
+ }
+
+ /**
* 社区网格后台重新发布已标记无效的事件
* @param commonEventRepublishDTO
* @return
@@ -255,4 +283,23 @@
return eventService.republishInvalidEvent(commonEventRepublishDTO);
}
+ /**
+ * 查询距离当前事件最近的网格数据
+ * @param pageEventGridNearbyDTO
+ * @return
+ */
+ @PostMapping("/grid/nearby")
+ R getNearByGrid(@RequestBody PageEventGridNearbyDTO pageEventGridNearbyDTO){
+ return eventService.getNearByGrid(pageEventGridNearbyDTO);
+ }
+
+ /**
+ * 直接上报社区
+ * @param commonEventDirectReportDTO
+ * @return
+ */
+ @PostMapping("/reportDirect")
+ R reportDirect(@RequestBody CommonEventDirectReportDTO commonEventDirectReportDTO){
+ return eventService.reportDirect(commonEventDirectReportDTO);
+ }
}
--
Gitblit v1.7.1