Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-03 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4

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

@@ -98,6 +98,12 @@
                eventVO.setAudios(audioList);
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if(StringUtils.isNotEmpty(imageUrl)){
                    eventVO.setGridMemberImageUrl(imageUrl);
                }
            });
            return R.ok(ipage);
        }
@@ -134,6 +140,28 @@
        if(eventDO!=null) {
            EventDetailsVO eventDetailsVO = new EventDetailsVO();
            BeanUtils.copyProperties(eventDO, eventDetailsVO);

            Integer event_status = eventDO.getEventStatus();
            Integer event_process_status = eventDO.getEventProcessStatus();
            Integer process_type = eventDO.getProcessType();
            Integer community_process = eventDO.getCommunityProcess();

            Integer eventDealStatus = -1;
            //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销
            if(event_status ==2 && event_process_status == 1 && process_type == 1) {
                eventDealStatus = 1;//"待处理"
            }else if(  event_process_status == 3) {
                eventDealStatus = 2;//"待验证"
            }else if(  event_status == 1 && community_process == 1 ) {
                eventDealStatus=3;//"已上报"
            }else if(  event_process_status == 2 ) {
                eventDealStatus=4;//"已解决"
            }else if(  event_status == 1 ) {
                eventDealStatus = 5;//"草稿箱"
            }else if( event_status == 4 ) {
                eventDealStatus=6;//"已撤销"
            }
            eventDetailsVO.setEventDealStatus(eventDealStatus);
            //查询事件关联附件
            List<EventResourceDO> eventResourceDOList =
                    eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -212,6 +240,13 @@
                eventTransferRecordVOS.add(eventTransferRecordVO);
            }
            eventDetailsVO.setTrans(eventTransferRecordVOS);

            //查询事件发布人头像
            String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
            if(StringUtils.isNotEmpty(imageUrl)){
                eventDetailsVO.setGridMemberImageUrl(imageUrl);
            }

            return R.ok(eventDetailsVO);
        }
        return R.fail();
@@ -242,6 +277,7 @@
                eventResourceDO.setUrl(commonEventAddDTO.getAudio());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
@@ -255,6 +291,7 @@
                eventResourceDO.setUrl(commonEventAddDTO.getVideo());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
@@ -306,6 +343,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
@@ -319,6 +357,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
@@ -366,6 +405,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
@@ -379,6 +419,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(commonEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
@@ -510,6 +551,7 @@
                eventResourceDO.setUrl(commonEventDealDTO.getAudio());
                eventResourceDO.setRefId(transferRecordDO.getId());
                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventDealDTO.getAudioTime());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
@@ -523,6 +565,7 @@
                eventResourceDO.setUrl(commonEventDealDTO.getVideo());
                eventResourceDO.setRefId(transferRecordDO.getId());
                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventDealDTO.getVideoTime());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
@@ -635,6 +678,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(specialEventEditDTO.getAudioTime());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
@@ -648,6 +692,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(specialEventEditDTO.getVideoTime());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
@@ -695,6 +740,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(specialEventEditDTO.getAudioTime());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
@@ -708,6 +754,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(specialEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(specialEventEditDTO.getVideoTime());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
@@ -761,6 +808,7 @@
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setUrl(specialEventAddDTO.getAudio());
                eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(specialEventAddDTO.getAudioTime());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (audioAdd != 1) {
                    throw new ServiceException("添加音频失败");
@@ -774,6 +822,7 @@
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setUrl(specialEventAddDTO.getVideo());
                eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(specialEventAddDTO.getVideoTime());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (videoAdd != 1) {
                    throw new ServiceException("添加视频失败");
@@ -837,6 +886,7 @@
                eventResourceDO.setUrl(publicityEventAddDTO.getAudio());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(publicityEventAddDTO.getAudioTime());
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(audioAdd!=1){
                    throw new ServiceException("添加音频失败");
@@ -850,6 +900,7 @@
                eventResourceDO.setUrl(publicityEventAddDTO.getVideo());
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(publicityEventAddDTO.getVideoTime());
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if(videoAdd!=1){
                    throw new ServiceException("添加视频失败");
@@ -899,6 +950,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(publicityEventEditDTO.getAudioTime());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
@@ -912,6 +964,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(publicityEventEditDTO.getVideoTime());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");
@@ -959,6 +1012,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(publicityEventEditDTO.getAudioTime());
                    int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (audioAdd != 1) {
                        throw new ServiceException("添加音频失败");
@@ -972,6 +1026,7 @@
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
                    eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
                    eventResourceDO.setResourceTime(publicityEventEditDTO.getVideoTime());
                    int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (videoAdd != 1) {
                        throw new ServiceException("添加视频失败");