代码合并

huanghongfa

2021-06-21 a429d8ffa31825c7cca7e005bc9ce8f85c15f1f6

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -8,9 +8,11 @@
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.LngLatUtils;
@@ -25,12 +27,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
@@ -234,10 +235,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);
@@ -280,6 +288,7 @@
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
                eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/")+1));
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (audioAdd != 1) {
                    throw new ServiceException("添加音频失败");
@@ -294,6 +303,7 @@
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
                eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/")+1));
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (videoAdd != 1) {
                    throw new ServiceException("添加视频失败");
@@ -309,6 +319,7 @@
                    eventResourceDO.setUrl(pica[i]);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                    eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/")+1));
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (picAdd != 1) {
                        throw new ServiceException("添加图片失败");
@@ -516,7 +527,7 @@
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
        eventDO.setRevokeID(eventRevokeDTO.getRevokeId());
        eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
@@ -1283,7 +1294,7 @@
        eventDO.setEventStatus(4);//4、撤销
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setRevokeID(eventRevokeDTO.getRevokeId());
        eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
        eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
@@ -2047,4 +2058,18 @@

        return R.fail();
    }

    /**
     * 事件大屏查询事件列表
     * @param eventListDTO  请求参数
     * @return  事件列表
     */
    @Override
    public R getScreenEventList(ScreenEventListDTO eventListDTO){
        if( eventListDTO.getEventType() != null && eventListDTO.getEventType().equals(ScreenEventListDTO.eventType.xc)){
            eventListDTO.setEventCategory(2);
        }
        IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(),eventListDTO.getPageSize()),eventListDTO);
        return R.ok(eventPageList);
    }
}