bugfixed

CeDo

2021-06-05 9cfd18f1e6ebfeb94030e3a907cd5e79e51a0780

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

@@ -52,7 +52,8 @@
    private CommunityService communityService;
    @Resource
    private EventGridDataMapper eventGridDataMapper;

    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;

    /**
     * 分页查找事件
@@ -252,6 +253,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 +321,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);
@@ -380,8 +389,8 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1 && eventDO.getEventDealStatus()!=6){
                return R.fail("保存草稿失败，事件不是草稿/已撤销状态");
            }
            BeanUtils.copyProperties(commonEventEditDTO, eventDO);
            eventDO.setGridMemberId(commonEventEditDTO.getUserId());
@@ -478,7 +487,7 @@
        if(updated!=1){
            throw new ServiceException("更新突发事件状态更新失败");
        }
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult());
        addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult(),2);
        return R.ok();

    }
@@ -492,11 +501,10 @@
        }
        boolean canRevoke = eventDO.getEventStatus()==2; //发布状态
        if(!canRevoke){
            return R.fail("当前事件不允许撤销");
            return R.fail("当前事件不允许·");
        }
        if(eventDO.getEventCategory()!=null && eventDO.getEventCategory().intValue()==2){//宣传教育事件
            //不做验证
        }else if(eventDO.getEventProcessStatus()==2 ||eventDO.getEventProcessStatus()==3) {   //已解决 或者 待验证 不允许撤销
        Integer eventProcessStatus = eventDO.getEventProcessStatus()!=null?eventDO.getEventProcessStatus():-1;
         if(eventProcessStatus==2 ||eventProcessStatus==3) {   //已解决 或者 待验证 不允许撤销
            return R.fail("当前事件不允许撤销");
        }
        eventDO.setEventStatus(4);
@@ -505,7 +513,8 @@
        eventDO.setCommunityProcess(0);//非 社区处理
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
                    1,"撤销成功", eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 7);
            return R.ok();
        }
        return R.fail();
@@ -542,8 +551,14 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        Integer processType = -1;
        if(eventDO.getInvalid()!=null){
            processType = 5;
        }else{
            processType = 1;
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成");
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成", processType);
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
@@ -623,7 +638,8 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, commonEventVerifyDTO.getProcessResult());
        addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, commonEventVerifyDTO.getProcessResult(),
                commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 6);
        return R.ok();
    }

@@ -643,7 +659,7 @@
        if(updated!=1){
            return R.fail("更新事件状态失败");
        }
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件");
        addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件", 8);
        return R.ok();
    }

@@ -671,11 +687,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 +703,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 +840,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 +924,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 +992,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);
@@ -1023,8 +1058,8 @@
        }else{
            //编辑原来的
            EventDO eventDO = eventMapper.selectById(publicityEventEditDTO.getId());
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
                return R.fail("保存草稿失败，事件不是草稿状态");
            if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1 && eventDO.getEventDealStatus()!=6){
                return R.fail("保存草稿失败，事件不是草稿/撤销状态");
            }
            BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
            eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
@@ -1205,18 +1240,32 @@
        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());
        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,"撤销成功");
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName(), 4);
            return R.ok();
        }
        return R.fail();
@@ -1235,7 +1284,7 @@
        eventDO.setInvalid(true);
        int updated = this.getBaseMapper().updateById(eventDO);
        if(updated == 1){
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功");
            addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功", 9 );
            return R.ok();
        }
        return R.fail();
@@ -1271,7 +1320,7 @@
            return R.fail("更新事件状态失败");
        }
        EventTransferRecordDO transferRecordDO =
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成");
                addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成", 3);
        if(transferRecordDO!=null && transferRecordDO.getId()!=null){
            //添加音频
            if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
@@ -1330,6 +1379,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
@@ -1348,6 +1446,7 @@
        eventTransferRecordDO.setProcessDate(new Date());
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult("发布成功");
        eventTransferRecordDO.setProcessType(0);//初始状态
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted!=1){
            throw new ServiceException("事件流转记录添加失败");
@@ -1355,6 +1454,7 @@
        this.updateEventDealStatus(eventId);
        return eventTransferRecordDO;
    }


    /**
     * 查询最后的流转记录，并添加事件流转记录
@@ -1365,7 +1465,7 @@
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg){
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg, Long processBy, String processByName, Integer processType){
        List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
                .eq(EventTransferRecordDO::getEventId, eventId)
                .orderByDesc(EventTransferRecordDO::getCreateAt)
@@ -1384,6 +1484,9 @@
        eventTransferRecordDO.setToName(toName);
        eventTransferRecordDO.setEventId(eventId);
        eventTransferRecordDO.setProcessResult(msg);
        eventTransferRecordDO.setProcessBy(processBy);
        eventTransferRecordDO.setProcessByName(processByName);
        eventTransferRecordDO.setProcessType(processType);
        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
        if(inserted==1) {
            this.updateEventDealStatus(eventId);
@@ -1391,6 +1494,20 @@
        }else{
            throw new ServiceException("事件流转记录添加失败");
        }
    }


    /**
     * 查询最后的流转记录，并添加事件流转记录
     * @param eventId 事件ID
     * @param toId 流转到 ID
     * @param toName 流转到 名称
     * @param toType 发送类型
     * @param msg 流转消息
     * @return
     */
    private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg,Integer processType){
        return addTransferRecord(eventId, toId, toName, toType, msg, null, null, processType);
    }

    /**
@@ -1464,4 +1581,23 @@
        }
        return -1;
    }

    /**
     * 后台管理-统计模块
     * @param communityId   社区id
     * @return  统计信息
     */
    @Override
    public R eventStatistics(Long communityId){
        return R.ok(this.baseMapper.eventStatistics(communityId));
    }
    /**
     * 后台管理-网格员统计
     * @param statisticsAdminDTO    请求参数
     * @return  网格员统计信息
     */
    @Override
    public R gridMemberStatistics(MemberStatisticsAdminDTO statisticsAdminDTO){
        return R.ok(eventGridMemberRelationMapper.gridMemberStatistics(new Page(statisticsAdminDTO.getPageNum(),statisticsAdminDTO.getPageSize()),statisticsAdminDTO));
    }
}