From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 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..c182fcd 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
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -28,6 +29,28 @@
@Resource
private EventService eventService;
+ /**
+ * description 获取所有未上传到浪潮平台的事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/getUnUploadEvent")
+ List<EventDetailsVO> getUnUploadEvent(){
+ return eventService.getUnUploadEvent();
+ }
+ /**
+ * description 更新上传是否成功标识
+ * @param id 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/updateLcUploadFlag")
+ Boolean updateLcUploadFlag(Long id){
+ return eventService.updateLcUploadFlag(id);
+ }
/**
* 分页查找事件
* @param pageEventDTO
@@ -46,8 +69,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 +88,7 @@
@PostMapping("/{id}")
R<EventDetailsVO> eventDetails(@PathVariable("id") Long id){
return eventService.eventDetails(id);
- };
+ }
/**
* 添加突发事件
@@ -66,7 +98,7 @@
@PostMapping("/addCommon")
R addCommon(@RequestBody CommonEventAddDTO commonEventAddDTO){
return eventService.addCommon(commonEventAddDTO);
- };
+ }
/**
* 保存草稿
* @param {classNameFirstLower}AddDTO 添加事件传递对象
@@ -135,6 +167,15 @@
return eventService.republishEvent(commonEventRepublishDTO);
}
+ /**
+ * 批量发布事件
+ * @param commonEventBatchRepublishDTO
+ * @return
+ */
+ @PostMapping("/batchRepublishEvent")
+ R batchRepublishEvent(@RequestBody CommonEventBatchRepublishDTO commonEventBatchRepublishDTO){
+ return eventService.batchRepublishEvent(commonEventBatchRepublishDTO);
+ }
/**
* 草稿发布
* @param commonEventPublicDTO
@@ -246,6 +287,16 @@
}
/**
+ * 批量事件标为无效
+ * @param eventBatchRevokeDTO
+ * @return
+ */
+ @PostMapping("/batchMarkInvalid")
+ R batchMarkEventInvalid(@RequestBody EventBatchRevokeDTO eventBatchRevokeDTO){
+ return eventService.batchMarkEventInvalid(eventBatchRevokeDTO);
+ }
+
+ /**
* 社区网格后台重新发布已标记无效的事件
* @param commonEventRepublishDTO
* @return
@@ -255,4 +306,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