From 8768317130cb1943e93d4109bee9ff71aa7f669b Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期四, 24 六月 2021 13:54:07 +0800 Subject: [PATCH] 走访 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 102 insertions(+), 7 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 d7fff02..7254790 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 @@ -2,17 +2,21 @@ 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; import com.panzhihua.common.enums.EventType; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO; +import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; +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.*; @@ -25,12 +29,11 @@ import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @author cedoo @@ -55,6 +58,8 @@ private EventGridMemberRelationMapper eventGridMemberRelationMapper; @Resource private EventGridDataService eventGridDataService; + @Resource + private EventResourceMapper eventResourceMapper; /** * 分页查找事件 @@ -234,10 +239,17 @@ } eventDetailsVO.setTrans(eventTransferRecordVOS); - //查询事件发布人头像 - String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId()); - if (StringUtils.isNotEmpty(imageUrl)) { - eventDetailsVO.setGridMemberImageUrl(imageUrl); + //查询网格员头像,姓名 + Map<String,Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId()); + if (!CollectionUtils.isEmpty(gridMember)) { + eventDetailsVO.setGridMemberName(gridMember.get("name") == null ? "" : gridMember.get("name").toString()); + eventDetailsVO.setGridMemberImageUrl(gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString()); + } + if(Objects.equals(eventDO.getGridMemberId(),eventDO.getCreateBy())){ + eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName()); + }else{ + Map<String,Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy()); + eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString()); } return R.ok(eventDetailsVO); @@ -2050,4 +2062,87 @@ return R.fail(); } + + /** + * 事件大屏查询事件列表 + * @param eventListDTO 请求参数 + * @return 事件列表 + */ + @Override + 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); + 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); + } + + @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