From bb3031392eb33434f67b6f37e08df72547a510ed Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 16 六月 2021 18:19:34 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 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 eaf051c..70af590 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
@@ -960,37 +960,39 @@
//查询事件播报模块数据
EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
- //查询事件资源文件
- List<EventResourceDO> eventResourceDOList =
- eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
- .eq(EventResourceDO::getClassification, 1)
- .eq(EventResourceDO::getRefId, newStatisticsVO.getId())
- );
- List<EventResourceVO> picList = new ArrayList<>();
- List<EventResourceVO> audioList = new ArrayList<>();
- List<EventResourceVO> videoList = new ArrayList<>();
- eventResourceDOList.forEach(eventResourceDO -> {
- switch (eventResourceDO.getType()) {
- case 1:
- EventResourceVO picEventResourceVO = new EventResourceVO();
- BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
- picList.add(picEventResourceVO);
- break;
- case 2:
- EventResourceVO audioResourceVO = new EventResourceVO();
- BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
- audioList.add(audioResourceVO);
- break;
- case 3:
- EventResourceVO videoResourceVO = new EventResourceVO();
- BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
- videoList.add(videoResourceVO);
- break;
- }
- });
- newStatisticsVO.setAudios(audioList);
- newStatisticsVO.setPics(picList);
- newStatisticsVO.setVideos(videoList);
+ if(newStatisticsVO != null){
+ //查询事件资源文件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1)
+ .eq(EventResourceDO::getRefId, newStatisticsVO.getId())
+ );
+ List<EventResourceVO> picList = new ArrayList<>();
+ List<EventResourceVO> audioList = new ArrayList<>();
+ List<EventResourceVO> videoList = new ArrayList<>();
+ eventResourceDOList.forEach(eventResourceDO -> {
+ switch (eventResourceDO.getType()) {
+ case 1:
+ EventResourceVO picEventResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
+ picList.add(picEventResourceVO);
+ break;
+ case 2:
+ EventResourceVO audioResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
+ audioList.add(audioResourceVO);
+ break;
+ case 3:
+ EventResourceVO videoResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
+ videoList.add(videoResourceVO);
+ break;
+ }
+ });
+ newStatisticsVO.setAudios(audioList);
+ newStatisticsVO.setPics(picList);
+ newStatisticsVO.setVideos(videoList);
+ }
statisticsVO.setNewStatisticsVO(newStatisticsVO);
//查询网格数据
--
Gitblit v1.7.1