From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index a7eb044..d1d2f27 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -13,6 +13,7 @@
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
@@ -1018,24 +1019,26 @@
/**
* 事件大屏统计接口
*
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
@Override
- public R getScreenEvent(Long communityId) {
+ public R getScreenEvent(BigScreenEventDTO screenEventDTO) {
+
+ Long communityId = screenEventDTO.getCommunityId();
//创建统计返回参数
EventStatisticsVO statisticsVO = new EventStatisticsVO();
//查询页面左边数据
EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
//查询左上数据
- EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
+ EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
//查询时间频发月份
List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
leftTopStatisticsVO.setOftenMonth(monthList);
leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
//查询左下数据
- EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
+ EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
statisticsVO.setLeftStatisticsVO(leftStatisticsVO);
@@ -1085,7 +1088,7 @@
statisticsVO.setGridStatisticsList(gridStatisticsList);
//查询社区事件列表
- List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
+ List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
statisticsVO.setGridIncidentList(gridIncidentList);
//查询小区列表
--
Gitblit v1.7.1