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/service/EventService.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
index 195f2ec..88af749 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -9,6 +9,8 @@
 import com.panzhihua.common.model.vos.grid.EventVO;
 import com.panzhihua.service_grid.model.dos.EventDO;
 
+import java.util.List;
+
 /**
  * 事件 service
  *
@@ -193,6 +195,34 @@
     R gridMemberStatistics(MemberStatisticsAdminDTO statisticsAdminDTO);
 
     /**
+     * 获取最近的网格
+     * @return
+     * @param pageEventGridNearbyDTO
+     */
+    R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO);
+
+    /**
+     * 批量删除事件
+     * @param eventDeleteDTO
+     * @return
+     */
+    R deleteEventBatch(EventDeleteDTO eventDeleteDTO);
+
+    /**
+     * 批量重新发布事件
+     * @param commonEventBatchRepublishDTO
+     * @return
+     */
+    R batchRepublishEvent(CommonEventBatchRepublishDTO commonEventBatchRepublishDTO);
+
+    /**
+     * 批量标记事件无效
+     * @param eventBatchRevokeDTO
+     * @return
+     */
+    R batchMarkEventInvalid(EventBatchRevokeDTO eventBatchRevokeDTO);
+
+    /**
      * 根据网格id查询网格统计数据
      * @param gridId    网格id
      * @return  网格统计数据
@@ -205,4 +235,27 @@
      * @return  网格事件统计数据
      */
     R getGridEventDetailStatisticsByApp(GridEventStatisticsDTO statisticsDTO);
+
+    /**
+     * 直接上报社区
+     * @param commonEventDirectReportDTO
+     * @return
+     */
+    R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO);
+    /**
+     * description 获取所有未上传到浪潮平台的事件列表
+     *
+     * @return String 事件列表
+     * @author manailin
+     * @date 2021/6/10 17:00
+     */
+    List<EventDetailsVO> getUnUploadEvent();
+    /**
+     * description 更新上传是否成功标识
+     * @param id 事件主键ID
+     * @return Boolean 上传是否成功
+     * @author manailin
+     * @date 2021/6/10 17:00
+     */
+    Boolean updateLcUploadFlag(Long id);
 }

--
Gitblit v1.7.1