Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-04 b3f04e40450d64c669feeb3cbdeb25063a223e45

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

@@ -129,7 +129,7 @@
            int updated = this.getBaseMapper().updateById(eventDO);
            return updated==1?R.ok():R.fail();
        }
        return R.fail("事件不是草稿/已撤销状态， 不允许删除");
        return R.fail("事件不是草稿/已撤销/无效状态， 不允许删除");
    }

    /**
@@ -142,31 +142,10 @@
        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);

            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
            eventDetailsVO.setGridName(eventGridDataDO.getGridName());
            if(eventGridDataDO!=null) {
                eventDetailsVO.setGridName(eventGridDataDO.getGridName());
            }

            //查询事件关联附件
            List<EventResourceDO> eventResourceDOList =
@@ -255,7 +234,7 @@

            return R.ok(eventDetailsVO);
        }
        return R.fail();
        return R.fail("事件不存在");
    }

    @Override
@@ -263,13 +242,17 @@
    public R addCommon(CommonEventAddDTO commonEventAddDTO) {
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(commonEventAddDTO, eventDO);
        eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        if(commonEventAddDTO instanceof  CommonEventCommunityAddDTO) {
            CommonEventCommunityAddDTO commonEventCommunityAddDTO = (CommonEventCommunityAddDTO)commonEventAddDTO;
            eventDO.setGridMemberId(commonEventCommunityAddDTO.getGridMemberId());
        }else{
            eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        }
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setEventProcessStatus(1);
        eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        eventDO.setGridMemberName(commonEventAddDTO.getUserName());
        eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
        eventDO.setCreateBy(commonEventAddDTO.getUserId());
@@ -340,6 +323,7 @@
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setGridMemberName(commonEventEditDTO.getUserName());
            eventDO.setGridMemberTelephone(commonEventEditDTO.getPhone());
            eventDO.setEventDealStatus(5);
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
@@ -391,6 +375,9 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            }
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
@@ -398,6 +385,7 @@
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setUpdateBy(commonEventEditDTO.getUserId());
            eventDO.setEventDealStatus(5);
            if (eventMapper.updateById(eventDO) > 0) {
                int deleted = eventResourceService.getBaseMapper()
                        .delete(new LambdaQueryWrapper<EventResourceDO>()
@@ -469,7 +457,7 @@

        R r  = communityService.detailCommunity(commonEventReportDTO.getToId());
        if(!R.isOk(r)){
            return R.fail("查询社区错误");
            return R.fail("社区不存在");
        }
        ComActVO comActVO= JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
        if(comActVO==null){
@@ -485,7 +473,7 @@
        if(updated!=1){
            throw new ServiceException("更新突发事件状态更新失败");
        }
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, "上报社区成功");
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult());
        return R.ok();

    }
@@ -522,6 +510,9 @@
    @Transactional(rollbackFor = Exception.class)
    public R dealEvent(CommonEventDealDTO commonEventDealDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventDealDTO.getId());
        if (eventDO == null) {
            return R.fail("事件不存在");
        }
        boolean canDealByUser = eventDO.getEventStatus()==2 && eventDO.getEventProcessStatus()==1;
        if(!canDealByUser){
            if(eventDO.getEventStatus()!=2){
@@ -536,7 +527,7 @@
        eventDO.setEventProcessStatus(2);//2已解决
        eventDO.setUpdateBy(commonEventDealDTO.getUserId());

        //更新出利润信息
        //更新处理信息
        eventDO.setProcessUserId(commonEventDealDTO.getUserId());
        eventDO.setProcessUserName(commonEventDealDTO.getUserName());
        eventDO.setProcessDate(new Date());
@@ -593,11 +584,21 @@
                    }
                }
            }

            Long transferRecordId = transferRecordDO.getId();
            EventDO eventDOToUpdate = this.getBaseMapper().selectById(commonEventDealDTO.getId());
            eventDOToUpdate.setProcessRecordId(transferRecordId);
            int transferRecordUpdated = this.getBaseMapper().updateById(eventDOToUpdate);
            if(transferRecordUpdated!=1){
                throw new ServiceException("更新事件处理流程失败");
            }

            return R.ok();
        }else{
            throw new ServiceException("处理事件记录出错");
        }
    }


    @Override
    public R verifyEvent(CommonEventVerifyDTO commonEventVerifyDTO) {
@@ -622,8 +623,8 @@
    }

    @Override
    public R republishEvent(CommonEventRepublicDTO commonEventRepublicDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublicDTO.getId());
    public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
        boolean canRepublishByUser = eventDO.getEventStatus()==4;
        if(!canRepublishByUser){
            return R.fail("当前不是撤销状态");
@@ -632,12 +633,12 @@
        eventDO.setEventStatus(2);//2 发布
        eventDO.setEventProcessStatus(1); //待解决
        eventDO.setProcessType(1);   //网格员处理
        eventDO.setUpdateBy(commonEventRepublicDTO.getUserId());
        eventDO.setUpdateBy(commonEventRepublishDTO.getUserId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventRepublicDTO.getUserId(), commonEventRepublicDTO.getUserName(), 1, "重新发布已撤销事件");
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件");
        return R.ok();
    }

@@ -675,6 +676,7 @@
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setCreateBy(specialEventEditDTO.getUserId());
            eventDO.setEventDealStatus(5);//草稿状态
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(specialEventEditDTO.getAudio())) {
@@ -729,10 +731,11 @@
            BeanUtils.copyProperties(specialEventEditDTO, eventDO);
            eventDO.setGridMemberId(specialEventEditDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setEventStatus(1);//事件状态 1草稿
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setUpdateBy(specialEventEditDTO.getUserId());
            eventDO.setEventDealStatus(5);//草稿状态
            if (eventMapper.updateById(eventDO) > 0) {
                int deleted = eventResourceService.getBaseMapper()
                        .delete(new LambdaQueryWrapper<EventResourceDO>()
@@ -801,7 +804,7 @@
        eventDO.setGridMemberId(specialEventAddDTO.getUserId());
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventType(EventType.SPECIAL);//特殊人群信息上报-事件分类
        eventDO.setEventStatus(1);//事件状态 1草稿
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setCreateBy(specialEventAddDTO.getUserId());
@@ -947,6 +950,7 @@
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
            eventDO.setGridMemberName(publicityEventEditDTO.getUserName());
            eventDO.setGridMemberTelephone(publicityEventEditDTO.getPhone());
            eventDO.setEventDealStatus(5);//草稿状态
            if (eventMapper.insert(eventDO) > 0) {
                //添加音频
                if (StringUtils.isNotEmpty(publicityEventEditDTO.getAudio())) {
@@ -998,13 +1002,17 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(publicityEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            }
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
            eventDO.setEventCategory(2L);//宣传事件
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setEventStatus(1);//事件状态 1草稿
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setUpdateBy(publicityEventEditDTO.getUserId());
            eventDO.setEventDealStatus(5);//草稿状态
            if (eventMapper.updateById(eventDO) > 0) {
                int deleted = eventResourceService.getBaseMapper()
                        .delete(new LambdaQueryWrapper<EventResourceDO>()
@@ -1114,6 +1122,193 @@
        return communityService.listCommunityAll();
    }

    @Override
    public R eventToManage(PageEventManageDTO pageEventManageDTO) {
        //查询管理事件
        Page page = new Page(1,10);
        if(pageEventManageDTO.getPageNum()!=null) {
            page.setCurrent(pageEventManageDTO.getPageNum());
        }
        if(pageEventManageDTO.getPageSize()!=null) {
            page.setSize(pageEventManageDTO.getPageSize());
        }
        IPage<EventVO> ipage = eventMapper.findToManageByPage(page, pageEventManageDTO);
        if(ipage!=null){
            List<EventVO> eventVOList = ipage.getRecords();
            eventVOList.forEach(eventVO -> {
                List<EventResourceDO> eventResourceDOList =
                        eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
                                .eq(EventResourceDO::getClassification, 1)
                                .eq(EventResourceDO::getRefId, eventVO.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;
                    }
                });
                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);
        }
        return R.fail();
    }

    @Override
    public R markEventInvalid(EventRevokeDTO eventRevokeDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(eventRevokeDTO.getId());
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        boolean canRevoke = eventDO.getEventDealStatus()==3; //发布状态
        if(!canRevoke){
            return R.fail("当前事件不是上报状态，不允许标为无效");
        }
        eventDO.setInvalid(false);
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setEventStatus(4);//4、撤销
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            return R.ok();
        }
        return R.fail();
    }

    @Override
    public R republishInvalidEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        boolean canRepulish = eventDO.getEventDealStatus()==7; //已失效状态
        if(!canRepulish){
            return R.fail("当前事件不是已失效状态，不能重新发布");
        }
        eventDO.setInvalid(true);
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功");
            return R.ok();
        }
        return R.fail();
    }

    @Override
    public R communityDealEvent(CommonEventDealDTO commonEventDealDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventDealDTO.getId());
        if (eventDO == null) {
            return R.fail("事件不存在");
        }
        boolean canDealByCommunity = eventDO.getEventDealStatus() == 3;
        if(!canDealByCommunity){
            return R.fail("事件当前不是上报状态");
        }

        if(commonEventDealDTO.getNeedVerify()){
            eventDO.setEventProcessStatus(3);//待验证状态
            eventDO.setProcessType(1);//交给网格员处理-验证
        }else {
            eventDO.setEventProcessStatus(2);//2已解决
        }
        eventDO.setUpdateBy(commonEventDealDTO.getUserId());

        //更新处理信息
        eventDO.setProcessUserId(commonEventDealDTO.getUserId());
        eventDO.setProcessUserName(commonEventDealDTO.getUserName());
        eventDO.setProcessDate(new Date());
        eventDO.setProcessDesc(commonEventDealDTO.getProcessResult());

        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成");
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(3);
                eventResourceDO.setType(2);
                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("添加音频失败");
                }
            }
            //添加视频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getVideo())){
                EventResourceDO eventResourceDO = new EventResourceDO();
                eventResourceDO.setClassification(3);
                eventResourceDO.setType(3);
                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("添加视频失败");
                }
            }
            //添加图片
            if(StringUtils.isNotEmpty(commonEventDealDTO.getPics())){
                String[] pica = commonEventDealDTO.getPics().split(",");
                for (int i = 0; i < pica.length; i++) {
                    EventResourceDO eventResourceDO = new EventResourceDO();
                    eventResourceDO.setClassification(3);
                    eventResourceDO.setType(1);
                    eventResourceDO.setUrl(pica[i]);
                    eventResourceDO.setRefId(transferRecordDO.getId());
                    eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if(picAdd!=1){
                        throw new ServiceException("添加图片失败");
                    }
                }
            }
            Long transferRecordId = transferRecordDO.getId();
            EventDO eventDOToUpdate = this.getBaseMapper().selectById(commonEventDealDTO.getId());
            eventDOToUpdate.setProcessRecordId(transferRecordId);
            int transferRecordUpdated = this.getBaseMapper().updateById(eventDOToUpdate);
            if(transferRecordUpdated!=1){
                throw new ServiceException("更新事件处理流程失败");
            }
            return R.ok();
        }else{
            throw new ServiceException("处理事件记录出错");
        }
    }

    /**
     * 添加发布事件流转记录
     * @param eventId 事件ID
@@ -1136,6 +1331,7 @@
        if(inserted!=1){
            throw new ServiceException("事件流转记录添加失败");
        }
        this.updateEventDealStatus(eventId);
        return eventTransferRecordDO;
    }

@@ -1169,9 +1365,58 @@
        eventTransferRecordDO.setProcessResult(msg);
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1) {
            this.updateEventDealStatus(eventId);
            return eventTransferRecordDO;
        }else{
            throw new ServiceException("事件流转记录添加失败");
        }
    }

    /**
     * 根据子状态 查询用户事件处理状态
     * @param eventId 事件ID
     */
    private EventDO  updateEventDealStatus(Long eventId){
        EventDO eventDO = this.getBaseMapper().selectById(eventId);
        Integer eventDealStatus = getEventDealStatus(eventDO);
        eventDO.setEventDealStatus(eventDealStatus);
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            return eventDO;
        }else{
            throw new ServiceException("更新事件处理状态错误");
        }
    }

    /**
     * 根据子状态 查询用户事件处理状态
     * @param eventDO 事件
     */
    private Integer  getEventDealStatus(EventDO eventDO){
        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已撤销、7已失效
        if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
            eventDealStatus = 7;//7已失效
        }else if(event_status!=null && event_status ==2 && event_process_status!=null && event_process_status == 1
                && process_type!=null  && process_type == 1) {
            eventDealStatus = 1;//"待处理"
        }else if( event_process_status!=null &&  event_process_status == 3) {
            eventDealStatus = 2;//"待验证"
        }else if(event_status!=null && event_status == 2 && community_process!=null
                && community_process == 1 && process_type!=null && process_type == 2) {
            eventDealStatus=3;//"已上报"
        }else if( event_process_status!=null && event_process_status == 2 ) {
            eventDealStatus=4;//"已解决"
        }else if(  event_status!=null && event_status == 1 ) {
            eventDealStatus = 5;//"草稿箱"
        }else if( event_status!=null && event_status == 4 ) {
            eventDealStatus=6;//"已撤销"
        }
        return eventDealStatus;
    }
}