From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 501d79b..4074fdb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,6 +18,7 @@
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ExcelSelectListUtil;
import com.panzhihua.common.utlis.LngLatUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
@@ -57,6 +59,10 @@
private EventSpecialCrowdRecordService eventSpecialCrowdRecordService;
@Resource
private EventSpecialCrowdRecordMapper eventSpecialCrowdRecordMapper;
+ @Resource
+ private EventGridDataService eventGridDataService;
+ @Resource
+ private EventResourceMapper eventResourceMapper;
/**
* 分页查找事件
@@ -2122,11 +2128,51 @@
* @return 事件列表
*/
@Override
- public R getScreenEventList(ScreenEventListDTO eventListDTO){
- if( eventListDTO.getEventType() != null && eventListDTO.getEventType().equals(ScreenEventListDTO.eventType.xc)){
- eventListDTO.setEventCategory(2);
+ public R getScreenEventList(ScreenEventListDTO eventListDTO) {
+ if (eventListDTO.getEventTypes() != null && !eventListDTO.getEventTypes().isEmpty()) {
+ eventListDTO.getEventTypes().forEach(eventType -> {
+ if(eventType.equals(ScreenEventListDTO.eventType.xc)){
+ eventListDTO.setEventCategory(null);
+ }
+ });
+
}
- IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(),eventListDTO.getPageSize()),eventListDTO);
+ IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(), eventListDTO.getPageSize()), eventListDTO);
+ if(!eventPageList.getRecords().isEmpty()){
+ eventPageList.getRecords().forEach(event -> {
+ //查询事件关联附件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1)
+ .eq(EventResourceDO::getRefId, event.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;
+ }
+ });
+ event.setAudios(audioList);
+ event.setPics(picList);
+ event.setVideos(videoList);
+ });
+ }
return R.ok(eventPageList);
}
@@ -2139,5 +2185,33 @@
public R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO){
IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(),specialPopulationDTO.getPageSize()),specialPopulationDTO);
return R.ok(specialPopulationVOIPage);
+
+ @Override
+ public List<EventDetailsVO> getUnUploadEvent() {
+ List<EventDetailsVO> eventDetailsVOList =new ArrayList<>();
+ List<EventDO> unEventList = baseMapper.selectList(
+ new QueryWrapper<EventDO>()
+ .eq("upload", false)
+ );
+ unEventList.forEach(eventDO -> {
+ eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
+ });
+ return eventDetailsVOList;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateLcUploadFlag(Long id) {
+ EventDO event = baseMapper.selectById(id);
+ event.setUpload(true);
+ baseMapper.updateById(event);
+ EventResourceDO eventResourceDO =new EventResourceDO();
+ eventResourceDO.setUpload(true);
+ int flag = eventResourceMapper.update(eventResourceDO, new QueryWrapper<EventResourceDO>()
+ .eq("ref_id", id));
+ if(flag>0){
+ return true;
+ }
+ return false;
}
}
--
Gitblit v1.7.1