Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382

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

@@ -50,35 +50,6 @@
    @Resource
    private CommunityService communityService;

    /**
     * 新增事件
     * @param eventAddDTO 事件新增DTO
     * @return 新增结果
     */
    public R add(EventAddDTO eventAddDTO){
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(eventAddDTO, eventDO);
        eventDO.setCreateAt(new Date());
        if(eventMapper.insert(eventDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 修改事件
     * @param eventEditDTO
     * @return 维护结果
     */
    public R edit(EventEditDTO eventEditDTO){
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(eventEditDTO, eventDO);
        //eventDO.setUpdateAt(new Date());
        if(eventMapper.updateById(eventDO)>0){
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查找事件
@@ -163,6 +134,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>()
@@ -271,6 +264,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("添加音频失败");
@@ -284,6 +278,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("添加视频失败");
@@ -335,6 +330,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("添加音频失败");
@@ -348,6 +344,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("添加视频失败");
@@ -395,6 +392,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("添加音频失败");
@@ -408,6 +406,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("添加视频失败");
@@ -539,6 +538,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("添加音频失败");
@@ -552,6 +552,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("添加视频失败");
@@ -664,6 +665,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("添加音频失败");
@@ -677,6 +679,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("添加视频失败");
@@ -724,6 +727,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("添加音频失败");
@@ -737,6 +741,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("添加视频失败");
@@ -790,6 +795,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("添加音频失败");
@@ -803,6 +809,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("添加视频失败");
@@ -866,6 +873,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("添加音频失败");
@@ -879,6 +887,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("添加视频失败");
@@ -928,6 +937,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("添加音频失败");
@@ -941,6 +951,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("添加视频失败");
@@ -988,6 +999,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("添加音频失败");
@@ -1001,6 +1013,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("添加视频失败");