From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 fd033d5..3e5592a 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
@@ -9,6 +10,8 @@
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.model.dos.EventDO;
+
+import java.util.List;
/**
* 事件 service
@@ -226,7 +229,7 @@
* @param gridId 网格id
* @return 网格统计数据
*/
- R getGridEventStatisticsByApp(Long gridId);
+ R getGridEventStatisticsByApp(Long gridId,Long userId);
/**
* 查询网格事件统计数据
@@ -255,4 +258,43 @@
* @return 社区人口数据列表
*/
R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO);
+ /**
+ * 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);
+
+ R eventWork(Long communityId);
+
+ /**
+ * 绘制多边形统计数据
+ * @param eventListDTO 请求参数
+ * @return 统计数据
+ */
+ R getCivilDrawList(ScreenDrawEventListDTO eventListDTO);
+
+ /**
+ * 大屏-根据小区id查询小区统计人数
+ * @param villageId 小区id
+ * @return 小区统计数据
+ */
+ R civilVillageStatistics(Long villageId);
+
+ /**
+ * 查询所有网格员工作汇总数据
+ * @param statisticsAdminDTO 请求参数
+ * @return 网格员工作汇总数据
+ */
+ R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO);
}
--
Gitblit v1.7.1