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

@@ -53,7 +53,6 @@
    @Resource
    private EventGridDataMapper eventGridDataMapper;


    /**
     * 分页查找事件
     * @param pageEventDTO
@@ -252,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);//网格员处理
@@ -316,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);
@@ -671,11 +678,14 @@

    /**
     * 生成服务单号
     * @param eventType
     * @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);
@@ -684,6 +694,10 @@

    @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();
@@ -817,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);
@@ -897,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());
@@ -961,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);
@@ -1205,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());
@@ -1330,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