Merge branch 'test_future_wangge' into test

CeDo

2021-06-08 d4b9ab5678abe6835e26d8984a5c10dbb6092f30

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

@@ -650,7 +650,8 @@
    @Override
    public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
        boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
        //boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
        boolean canRepublishByUser = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态
        if (!canRepublishByUser) {
            return R.fail("当前不是撤销/草稿状态");
        }
@@ -1289,9 +1290,9 @@
        if (eventDO == null) {
            return R.fail("事件不存在");
        }
        boolean canRepulish = eventDO.getEventDealStatus() == 7; //已失效状态
        boolean canRepulish = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态
        if (!canRepulish) {
            return R.fail("当前事件不是已失效状态，不能重新发布");
            return R.fail("当前事件不是已失效状态/草稿状态，不能重新发布");
        }
        eventDO.setInvalid(true);
        int updated = this.getBaseMapper().updateById(eventDO);
@@ -1504,14 +1505,13 @@
                .eq(EventTransferRecordDO::getEventId, eventId)
                .orderByDesc(EventTransferRecordDO::getCreateAt)
        );
        if (list == null || list.size() == 0) {
            throw new ServiceException("事件流转记录异常");
        }
        EventTransferRecordDO lastRecord = list.get(0);
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        eventTransferRecordDO.setFromType(lastRecord.getToType());
        eventTransferRecordDO.setFromId(lastRecord.getToId());
        eventTransferRecordDO.setFromName(lastRecord.getToName());
        if (list != null || list.size() > 0) {
            eventTransferRecordDO.setFromType(lastRecord.getToType());
            eventTransferRecordDO.setFromId(lastRecord.getToId());
            eventTransferRecordDO.setFromName(lastRecord.getToName());
        }
        eventTransferRecordDO.setToType(toType);
        eventTransferRecordDO.setToId(toId);
        eventTransferRecordDO.setProcessDate(new Date());
@@ -1679,23 +1679,28 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R deleteEventBatch(EventDeleteDTO eventDeleteDTO) {
        List<Long> eventIds = eventDeleteDTO.getId();
        List<String> eventIds = eventDeleteDTO.getId();
        if (eventIds != null && eventIds.size() > 0) {
            R rt = null;
            Long userId = eventDeleteDTO.getUserId();
            for (Long id : eventIds) {
                EventDO eventDO = eventMapper.selectById(id);
                if (eventDO == null) {
                    throw new ServiceException("id为" + id + "的事件不存在");
                }
                if (eventDO.getEventStatus() != null &&
                        (eventDO.getEventStatus().intValue() == 1 || eventDO.getEventStatus().intValue() == 4)) {//草稿 或者 已撤销 的事件可以删除
                    eventDO.setEventStatus(3);//逻辑删除
                    eventDO.setUpdateBy(userId);
                    int updated = this.getBaseMapper().updateById(eventDO);
                    if (updated != 1) {
                        throw new ServiceException("删除事件失败");
            for (String id : eventIds) {
                try {
                    Long eventId = Long.parseLong(id);
                    EventDO eventDO = eventMapper.selectById(eventId);
                    if (eventDO == null) {
                        throw new ServiceException("id为" + id + "的事件不存在");
                    }
                    if (eventDO.getEventStatus() != null &&
                            (eventDO.getEventStatus().intValue() == 1 || eventDO.getEventStatus().intValue() == 4)) {//草稿 或者 已撤销 的事件可以删除
                        eventDO.setEventStatus(3);//逻辑删除
                        eventDO.setUpdateBy(userId);
                        int updated = this.getBaseMapper().updateById(eventDO);
                        if (updated != 1) {
                            throw new ServiceException("删除事件失败");
                        }
                    }
                }catch (Exception e){
                    throw new ServiceException("事件ID错误，删除失败");
                }
            }
            return R.ok();
@@ -1708,17 +1713,23 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R batchRepublishEvent(CommonEventBatchRepublishDTO commonEventBatchRepublishDTO) {
        List<Long> ids = commonEventBatchRepublishDTO.getId();
        List<String> ids = commonEventBatchRepublishDTO.getId();
        if (ids != null && ids.size() > 0) {
            Long userId = commonEventBatchRepublishDTO.getUserId();
            String userName = commonEventBatchRepublishDTO.getUserName();
            for (Long id : ids) {
                EventDO eventDO = this.getBaseMapper().selectById(id);
            for (String id : ids) {
                Long eventId = -1L;
                try {
                    eventId = Long.parseLong(id);
                }catch (Exception e){
                    throw new ServiceException("事件ID错误，发布失败");
                }
                EventDO eventDO = this.getBaseMapper().selectById(eventId);
                if (eventDO == null) {
                    throw new ServiceException("id为" + id + "的事件不存在");
                }
                boolean canRepublishByUser = eventDO.getEventStatus() != null &&
                        eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
                boolean canRepublishByUser = eventDO.getEventDealStatus() != null &&
                        (eventDO.getEventDealStatus() == 5 || eventDO.getEventDealStatus() == 6);
                if (!canRepublishByUser) {
                    throw new ServiceException("当前不是撤销/草稿状态");
                }
@@ -1731,7 +1742,7 @@
                    throw new ServiceException("更新事件状态失败");
                }
                addTransferRecord(eventDO.getId(), userId, userName, 1,
                        "重新发布已撤销事件", userId, userName, 8);
                            "重新发布已撤销事件", userId, userName, 8);
            }
            return R.ok();
        } else {
@@ -1742,14 +1753,20 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R batchMarkEventInvalid(EventBatchRevokeDTO eventBatchRevokeDTO) {
        List<Long> ids = eventBatchRevokeDTO.getId();
        List<String> ids = eventBatchRevokeDTO.getId();
        if (ids != null && ids.size() > 0) {
            Long userId = eventBatchRevokeDTO.getUserId();
            String userName = eventBatchRevokeDTO.getUserName();
            Long communityId = eventBatchRevokeDTO.getCommunityId();
            String communityName = eventBatchRevokeDTO.getCommunityName();
            for (Long id : ids) {
                EventDO eventDO = this.getBaseMapper().selectById(id);
            for (String id : ids) {
                Long eventId = -1L;
                try {
                    eventId = Long.parseLong(id);
                }catch (Exception e){
                    throw new ServiceException("事件ID错误，不能标记失效");
                }
                EventDO eventDO = this.getBaseMapper().selectById(eventId);
                if (eventDO == null) {
                    throw new ServiceException("id为" + id + "的事件不存在");
                }
@@ -1838,6 +1855,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO) {

        if(commonEventDirectReportDTO.getEventId()!=null){
@@ -1850,10 +1868,9 @@
            eventDO.setGridMemberId(commonEventDirectReportDTO.getUserId());
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventStatus(1);//事件状态 2发布
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setProcessType(2);//社区处理
            eventDO.setCommunityProcess(1);// 社区处理
            eventDO.setUpdateBy(commonEventDirectReportDTO.getUserId());
            eventDO.setEventDealStatus(5);
            if (eventMapper.updateById(eventDO) > 0) {
                int deleted = eventResourceService.getBaseMapper()
                        .delete(new LambdaQueryWrapper<EventResourceDO>()
@@ -1938,8 +1955,8 @@
            }
            eventDO.setEventCategory(1l);//办件事件
            eventDO.setEventStatus(2);//事件状态 2发布
            eventDO.setProcessType(1);//网格员处理
            eventDO.setCommunityProcess(0);//非 社区处理
            eventDO.setProcessType(2);//社区处理
            eventDO.setCommunityProcess(1);//社区处理
            eventDO.setEventProcessStatus(1);
            eventDO.setGridMemberName(commonEventDirectReportDTO.getUserName());
            eventDO.setGridMemberTelephone(commonEventDirectReportDTO.getPhone());
@@ -2014,7 +2031,7 @@
                }
                addTransferRecord(eventDO.getId(), commonEventDirectReportDTO.getToId(), comActVO.getName(), 2, commonEventDirectReportDTO.getProcessResult(),
                        commonEventDirectReportDTO.getUserId(), commonEventDirectReportDTO.getUserName(), 2);
                return R.ok();
                return R.ok(eventDO.getId());
            }
        }