Merge branch 'test_future_wangge' into test

CeDo

2021-06-05 09188b70a64cea8de763c9ab7fe9c2f36c39db01

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

@@ -28,6 +28,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -52,12 +53,12 @@
    @Resource
    private EventGridDataMapper eventGridDataMapper;


    /**
     * 分页查找事件
     * @param pageEventDTO
     * @return 维护结果
     */
    @Override
    public R<IPage<EventVO>> query(PageEventDTO pageEventDTO){
        Page page = new Page(1,10);
        if(pageEventDTO.getPageNum()!=null) {
@@ -117,6 +118,7 @@
     * @param commonEventDeleteDTO
     * @return 平台用户信息
     */
    @Override
    public R delete(CommonEventDeleteDTO commonEventDeleteDTO){
        EventDO eventDO = eventMapper.selectById(commonEventDeleteDTO.getId());
        if(eventDO==null){
@@ -137,6 +139,7 @@
     * @param id 事件 id
     * @return 查找结果
     */
    @Override
    public R<EventDetailsVO> eventDetails(Long id){
        EventDO eventDO = eventMapper.selectById(id);
        if(eventDO!=null) {
@@ -248,6 +251,10 @@
        }else{
            eventDO.setGridMemberId(commonEventAddDTO.getUserId());
        }
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(commonEventAddDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        eventDO.setEventCategory(1l);//办件事件
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//网格员处理
@@ -257,6 +264,7 @@
        eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
        eventDO.setCreateBy(commonEventAddDTO.getUserId());
        eventDO.setSubmitDate(new Date());
        eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
        if(eventMapper.insert(eventDO)==1){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventAddDTO.getAudio())){
@@ -311,6 +319,10 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveDraft(CommonEventEditDTO commonEventEditDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(commonEventEditDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        if(commonEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
@@ -618,7 +630,7 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, "事件验证完成");
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, commonEventVerifyDTO.getProcessResult());
        return R.ok();
    }

@@ -650,6 +662,7 @@
        if(!draftCanRelease){
            return R.fail("当前不是草稿状态");
        }
        eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
        eventDO.setEventStatus(2);//事件状态 2发布
        eventDO.setProcessType(1);//当前处理对象类型:网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
@@ -663,8 +676,28 @@
        return R.ok();
    }

    /**
     * 生成服务单号
     * @param eventType 事件类型，宣传事件默认为20
     * @return
     */
    private String getEventOrderSn(Integer eventType) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
        if(eventType==null){
            eventType =  20;
        }
        String pre = String.format(simpleDateFormat.format(new Date()) + "%02d", eventType);
        Integer todayCount = this.getBaseMapper().selectCount(new LambdaQueryWrapper<EventDO>().likeRight(EventDO::getOrderSn, pre));
        String orderSn =  String.format(pre + "%04d", todayCount+1);
        return orderSn;
    }

    @Override
    public R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(specialEventEditDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        R rtVal = R.fail();
        if(specialEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
@@ -798,6 +831,10 @@

    @Override
    public R addSpecial(SpecialEventAddDTO specialEventAddDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(specialEventAddDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        R rtVal = R.fail();
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(specialEventAddDTO, eventDO);
@@ -808,6 +845,7 @@
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setCreateBy(specialEventAddDTO.getUserId());
        eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
        if (eventMapper.insert(eventDO) > 0) {
            //添加音频
            if (StringUtils.isNotEmpty(specialEventAddDTO.getAudio())) {
@@ -877,6 +915,10 @@

    @Override
    public R addPublicity(PublicityEventAddDTO publicityEventAddDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(publicityEventAddDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        EventDO eventDO = new EventDO();
        BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
        eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
@@ -886,6 +928,7 @@
        eventDO.setGridMemberName(publicityEventAddDTO.getUserName());
        eventDO.setGridMemberTelephone(publicityEventAddDTO.getPhone());
        eventDO.setCreateBy(publicityEventAddDTO.getUserId());
        eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
        if(eventMapper.insert(eventDO)==1){
            //添加音频
            if(StringUtils.isNotEmpty(publicityEventAddDTO.getAudio())){
@@ -940,6 +983,10 @@

    @Override
    public R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO) {
        EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(publicityEventEditDTO.getGridId());
        if(eventGridDataDO==null){
            return R.fail("网格不存在");
        }
        if(publicityEventEditDTO.getId()==null) {
            EventDO eventDO = new EventDO();
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
@@ -1184,9 +1231,22 @@
        if(eventDO==null){
            return R.fail("事件不存在");
        }
        boolean canRevoke = eventDO.getEventDealStatus()==3; //发布状态
        if(!canRevoke){
            return R.fail("当前事件不是上报状态，不允许标为无效");
        if(eventDO.getEventCategory()!=null) {
            if (eventDO.getEventCategory() == 1) {
                boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
                if (!canRevoke) {
                    return R.fail("当前事件不是上报状态，不允许标为无效");
                }
            }else if (eventDO.getEventCategory() == 2) {
                boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
                if (!canRevoke) {
                    return R.fail("当前事件不是发布状态，不允许标为无效");
                }
            }else{
                return R.fail("");
            }
        }else{
            return R.fail("事件所属错误");
        }
        eventDO.setInvalid(false);
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
@@ -1309,6 +1369,55 @@
        }
    }

    @Override
    public R selectCommunityPublicity(PagePublicityEventCommunityDTO pagePublicityEventDTO) {
        Page page = new Page(1,10);
        if(pagePublicityEventDTO.getPageNum()!=null) {
            page.setCurrent(pagePublicityEventDTO.getPageNum());
        }
        if(pagePublicityEventDTO.getPageSize()!=null) {
            page.setSize(pagePublicityEventDTO.getPageSize());
        }
        IPage<EventVO> ipage = eventMapper.findCommunityPublicityByPage(page, pagePublicityEventDTO);
        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);
            });
            return R.ok(ipage);
        }
        return R.fail();
    }

    /**
     * 添加发布事件流转记录
     * @param eventId 事件ID
@@ -1393,41 +1502,51 @@
     * @param eventDO 事件
     */
    private Integer  getEventDealStatus(EventDO eventDO){
        //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效、8已发布
        if(eventDO.getEventCategory()!=null) {
            if (eventDO.getEventCategory() == 1) {
                Integer event_status = eventDO.getEventStatus();
                Integer event_process_status = eventDO.getEventProcessStatus();
                Integer process_type = eventDO.getProcessType();
                Integer community_process = eventDO.getCommunityProcess();
                Integer event_status = eventDO.getEventStatus()!=null?eventDO.getEventStatus():-1;
                Integer event_process_status = eventDO.getEventProcessStatus()!=null?eventDO.getEventProcessStatus():-1;
                Integer process_type = eventDO.getProcessType()!=null?eventDO.getProcessType():-1;
                Integer community_process = eventDO.getCommunityProcess()!=null?eventDO.getCommunityProcess():-1;

                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;//"已撤销"
                    eventDealStatus = 7;
                    //7已失效
                } else if (event_status == 1) {
                    eventDealStatus = 5;
                    //"草稿箱"
                } else if ( event_status == 4) {
                    eventDealStatus = 6;
                    //"已撤销"
                } else if (event_status ==2){
                    if (event_process_status == 3) {
                        eventDealStatus = 2;
                        //"待验证"
                    }else if (event_process_status == 2) {
                        eventDealStatus = 4;
                        //"已解决"
                    }else if ( community_process == 1 &&  process_type == 2) {
                        eventDealStatus = 3;
                        //"已上报"
                    }else if ( event_process_status == 1 && process_type == 1) {
                        eventDealStatus = 1;
                        //"待处理"
                    } 
                }
                return eventDealStatus;
            } else if (eventDO.getEventCategory() == 2) {
                Integer event_status = eventDO.getEventStatus();
                if (event_status != null && event_status == 1) {
                    return 5; //"草稿箱"
                    return 5;
                    //"草稿箱"
                } else if (event_status != null && event_status == 2) {
                    return 8;//已发布
                    return 8;
                    //已发布
                } else if (event_status != null && event_status == 4) {
                    return 6;//"已撤销"
                    return 6;
                    //"已撤销"
                }
            }
        }