From bb1b8101a3b31a03cae378bfcb16f4576f154647 Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期四, 27 五月 2021 19:56:52 +0800 Subject: [PATCH] 代码同步 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 518 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 513 insertions(+), 5 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java index 555010a..2a0b782 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java @@ -1,24 +1,31 @@ package com.panzhihua.service_grid.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.panzhihua.common.model.dtos.grid.EventAddDTO; -import com.panzhihua.common.model.dtos.grid.EventDeleteDTO; -import com.panzhihua.common.model.dtos.grid.EventEditDTO; -import com.panzhihua.common.model.dtos.grid.PageEventDTO; +import com.panzhihua.common.exceptions.ServiceException; +import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventDetailsVO; +import com.panzhihua.common.model.vos.grid.EventResourceVO; +import com.panzhihua.common.model.vos.grid.EventTransferRecordVO; import com.panzhihua.common.model.vos.grid.EventVO; +import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_grid.dao.*; import com.panzhihua.service_grid.model.dos.*; +import com.panzhihua.service_grid.service.EventResourceService; import com.panzhihua.service_grid.service.EventService; +import com.panzhihua.service_grid.service.EventTransferRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @auther lyq @@ -31,6 +38,12 @@ @Resource private EventMapper eventMapper; + + @Resource + private EventResourceService eventResourceService; + @Resource + private EventTransferRecordService eventTransferRecordService; + /** * 新增事件 * @param eventAddDTO @@ -74,7 +87,44 @@ if(pageEventDTO.getPageSize()!=null) { page.setSize(pageEventDTO.getPageSize()); } - return R.ok(eventMapper.findByPage(page, pageEventDTO)); + IPage<EventVO> ipage = eventMapper.findByPage(page, pageEventDTO); + 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(); } /** @@ -96,9 +146,467 @@ if(eventDO!=null) { EventDetailsVO eventDetailsVO = new EventDetailsVO(); BeanUtils.copyProperties(eventDO, eventDetailsVO); + //查询事件关联附件 + + List<EventResourceDO> eventResourceDOList = + eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>() + .eq(EventResourceDO::getClassification, 1) + .eq(EventResourceDO::getRefId, id) + ); + 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; + } + }); + eventDetailsVO.setAudios(audioList); + eventDetailsVO.setPics(picList); + eventDetailsVO.setVideos(videoList); + + + + //查询事件流转记录 + List<EventTransferRecordDO> eventTransferRecordDOList = eventTransferRecordService.getBaseMapper() + .selectList(new LambdaQueryWrapper<EventTransferRecordDO>() + .eq(EventTransferRecordDO::getEventId, id) + ); + + List<EventTransferRecordVO> eventTransferRecordVOS = new ArrayList<>(); + for (EventTransferRecordDO eventTransferRecordDO : eventTransferRecordDOList) { + EventTransferRecordVO eventTransferRecordVO = new EventTransferRecordVO(); + BeanUtils.copyProperties(eventTransferRecordDO, eventTransferRecordVO); + List<EventResourceDO> eventTransferResourceDOList = + eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>() + .eq(EventResourceDO::getClassification, 3) + .eq(EventResourceDO::getRefId, eventTransferRecordDO.getId()) + ); + List<EventResourceVO> transferPicList = new ArrayList<>(); + List<EventResourceVO> transferAudioList = new ArrayList<>(); + List<EventResourceVO> transferVideoList = new ArrayList<>(); + eventTransferResourceDOList.forEach(eventResourceDO -> { + switch (eventResourceDO.getType()){ + case 1: + EventResourceVO picEventResourceVO = new EventResourceVO(); + BeanUtils.copyProperties(eventResourceDO, picEventResourceVO); + transferPicList.add(picEventResourceVO); + break; + case 2: + EventResourceVO audioResourceVO = new EventResourceVO(); + BeanUtils.copyProperties(eventResourceDO, audioResourceVO); + transferAudioList.add(audioResourceVO); + break; + case 3: + EventResourceVO videoResourceVO = new EventResourceVO(); + BeanUtils.copyProperties(eventResourceDO, videoResourceVO); + transferVideoList.add(videoResourceVO); + break; + } + }); + eventTransferRecordVO.setAudios(transferAudioList); + eventTransferRecordVO.setPics(transferPicList); + eventTransferRecordVO.setVideos(transferVideoList); + eventTransferRecordVOS.add(eventTransferRecordVO); + } + eventDetailsVO.setTrans(eventTransferRecordVOS); return R.ok(eventDetailsVO); } return R.fail(); } + @Override + @Transactional(rollbackFor = Exception.class) + public R addEmergencies(EmergenciesEventAddDTO emergenciesEventAddDTO) { + EventDO eventDO = new EventDO(); + BeanUtils.copyProperties(emergenciesEventAddDTO, eventDO); + eventDO.setGridMemberId(emergenciesEventAddDTO.getUserId()); + eventDO.setEventCategory(1l);//办件事件 + eventDO.setEventType(5);//突发事件分类 + eventDO.setEventStatus(2);//事件状态 2发布 + eventDO.setProcessType(1);//网格员处理 + eventDO.setCommunityProcess(0);//非 社区处理 + eventDO.setEventProcessStatus(1); + eventDO.setGridMemberId(emergenciesEventAddDTO.getUserId()); + eventDO.setGridMemberName(emergenciesEventAddDTO.getUserName()); + eventDO.setGridMemberTelephone(emergenciesEventAddDTO.getPhone()); + eventDO.setCreateBy(emergenciesEventAddDTO.getUserId()); + if(eventMapper.insert(eventDO)==1){ + //添加音频 + if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getAudio())){ + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(2); + eventResourceDO.setUrl(emergenciesEventAddDTO.getAudio()); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId()); + int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if(audioAdd!=1){ + throw new ServiceException("添加音频失败"); + } + } + //添加视频 + if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getVideo())){ + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(3); + eventResourceDO.setUrl(emergenciesEventAddDTO.getVideo()); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId()); + int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if(videoAdd!=1){ + throw new ServiceException("添加视频失败"); + } + } + //添加图片 + if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getPics())){ + String[] pica = emergenciesEventAddDTO.getPics().split(","); + for (int i = 0; i < pica.length; i++) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(1); + eventResourceDO.setUrl(pica[i]); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId()); + int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if(picAdd!=1){ + throw new ServiceException("添加图片失败"); + } + } + } + return R.ok(); + } + return R.fail(); + } + + @Override + public R saveEmergenciesDraft(EmergenciesEventEditDTO emergenciesEventEditDTO) { + if(emergenciesEventEditDTO.getId()==null) { + EventDO eventDO = new EventDO(); + BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO); + eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId()); + eventDO.setEventCategory(1l);//办件事件 + eventDO.setEventType(5);//突发事件分类 + eventDO.setEventStatus(1);//事件状态 1草稿 + eventDO.setProcessType(1);//网格员处理 + eventDO.setCommunityProcess(0);//非 社区处理 + eventDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + if (eventMapper.insert(eventDO) > 0) { + //添加音频 + if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getAudio())) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(2); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setUrl(emergenciesEventEditDTO.getAudio()); + eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if (audioAdd != 1) { + throw new ServiceException("添加音频失败"); + } + } + //添加视频 + if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getVideo())) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(3); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setUrl(emergenciesEventEditDTO.getVideo()); + eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if (videoAdd != 1) { + throw new ServiceException("添加视频失败"); + } + } + //添加图片 + if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getPics())) { + String[] pica = emergenciesEventEditDTO.getPics().split(","); + for (int i = 0; i < pica.length; i++) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(1); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setUrl(pica[i]); + eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if (picAdd != 1) { + throw new ServiceException("添加图片失败"); + } + } + } + return R.ok(); + } + return R.fail(); + }else{ + //编辑原来的 + EventDO eventDO = eventMapper.selectById(emergenciesEventEditDTO.getId()); + BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO); + eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId()); + eventDO.setEventCategory(1l);//办件事件 + eventDO.setEventType(5);//突发事件分类 + eventDO.setEventStatus(1);//事件状态 2发布 + eventDO.setProcessType(1);//网格员处理 + eventDO.setCommunityProcess(0);//非 社区处理 + eventDO.setUpdateBy(emergenciesEventEditDTO.getUserId()); + if (eventMapper.updateById(eventDO) > 0) { + int deleted = eventResourceService.getBaseMapper() + .delete(new LambdaQueryWrapper<EventResourceDO>() + .eq(EventResourceDO::getClassification,1) + .eq(EventResourceDO::getRefId, eventDO.getId())); + //添加音频 + if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getAudio())) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(2); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setUrl(emergenciesEventEditDTO.getAudio()); + eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if (audioAdd != 1) { + throw new ServiceException("添加音频失败"); + } + } + //添加视频 + if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getVideo())) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(3); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setUrl(emergenciesEventEditDTO.getVideo()); + eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if (videoAdd != 1) { + throw new ServiceException("添加视频失败"); + } + } + //添加图片 + if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getPics())) { + String[] pica = emergenciesEventEditDTO.getPics().split(","); + for (int i = 0; i < pica.length; i++) { + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(1); + eventResourceDO.setType(1); + eventResourceDO.setRefId(eventDO.getId()); + eventResourceDO.setUrl(pica[i]); + eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId()); + int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if (picAdd != 1) { + throw new ServiceException("添加图片失败"); + } + } + } + return R.ok(); + } + return R.fail(); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public R emergenciesReport(EmergenciesEventReportDTO emergenciesEventReportDTO) { + EventDO eventDO = this.getBaseMapper().selectById(emergenciesEventReportDTO.getEventId()); + if(eventDO==null){ + return R.fail("事件不存在"); + } + if(eventDO.getEventStatus()!=2){ + return R.fail("当前事件不能上报社区"); + } + if(eventDO.getProcessType()==2){ + return R.fail("当前事件已交由社区处理"); + } + eventDO.setCommunityProcess(1); + eventDO.setProcessType(2); + eventDO.setEventProcessStatus(1); + eventDO.setUpdateBy(emergenciesEventReportDTO.getUserId()); + int updated = this.getBaseMapper().updateById(eventDO); + if(updated!=1){ + throw new ServiceException("更新突发事件状态更新失败"); + } + EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO(); + BeanUtils.copyProperties(emergenciesEventReportDTO, eventTransferRecordDO); + eventTransferRecordDO.setFromType(1); + eventTransferRecordDO.setFromId(emergenciesEventReportDTO.getUserId()); + eventTransferRecordDO.setFromName(emergenciesEventReportDTO.getUserName()); + eventTransferRecordDO.setToType(2); + eventTransferRecordDO.setProcessDate(new Date()); + int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO); + return inserted==1?R.ok():R.fail(); + } + + @Override + public R emergenciesRevoke(EventRevokeDTO eventRevokeDTO) { + EventDO eventDO = this.getBaseMapper().selectById(eventRevokeDTO.getId()); + if(eventDO==null){ + return R.fail("事件不存在"); + } + boolean canRevoke = eventDO.getEventStatus()==2 && eventDO.getCommunityProcess()==0; + if(!canRevoke){ + return R.fail("当前事件不允许撤销"); + } + eventDO.setEventStatus(4); + eventDO.setUpdateBy(eventRevokeDTO.getUserId()); + int updated = this.getBaseMapper().updateById(eventDO); + return updated==1?R.ok():R.fail(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public R dealEvent(EventDealDTO eventDealDTO) { + EventDO eventDO = this.getBaseMapper().selectById(eventDealDTO.getId()); + boolean canDealByUser = eventDO.getEventStatus()==2 && eventDO.getEventProcessStatus()==1; + if(!canDealByUser){ + if(eventDO.getEventStatus()!=2){ + return R.fail("事件不是发布状态"); + } + if(eventDO.getEventProcessStatus()!=1){ + return R.fail("事件不是待处理状态"); + } + return R.fail("事件当前不可自处理"); + } + + eventDO.setEventProcessStatus(2);//2已解决 + eventDO.setUpdateBy(eventDealDTO.getUserId()); + int updated = this.getBaseMapper().updateById(eventDO); + if(updated!=1){ + return R.fail("更新事件状态失败"); + } + + EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO(); + BeanUtils.copyProperties(eventDealDTO, eventTransferRecordDO); + eventTransferRecordDO.setFromType(1); + eventTransferRecordDO.setFromId(eventDealDTO.getUserId()); + eventTransferRecordDO.setFromName(eventDealDTO.getUserName()); + eventTransferRecordDO.setToType(1); + eventTransferRecordDO.setToId(eventDealDTO.getUserId()); + eventTransferRecordDO.setProcessDate(new Date()); + eventTransferRecordDO.setEventId(eventDO.getId()); + int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO); + if(inserted==1){ + //添加音频 + if(StringUtils.isNotEmpty(eventDealDTO.getAudio())){ + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(3); + eventResourceDO.setType(2); + eventResourceDO.setUrl(eventDealDTO.getAudio()); + eventResourceDO.setRefId(eventTransferRecordDO.getId()); + eventResourceDO.setCreateBy(eventDealDTO.getUserId()); + int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if(audioAdd!=1){ + throw new ServiceException("添加音频失败"); + } + } + //添加视频 + if(StringUtils.isNotEmpty(eventDealDTO.getVideo())){ + EventResourceDO eventResourceDO = new EventResourceDO(); + eventResourceDO.setClassification(3); + eventResourceDO.setType(3); + eventResourceDO.setUrl(eventDealDTO.getVideo()); + eventResourceDO.setRefId(eventTransferRecordDO.getId()); + eventResourceDO.setCreateBy(eventDealDTO.getUserId()); + int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if(videoAdd!=1){ + throw new ServiceException("添加视频失败"); + } + } + //添加图片 + if(StringUtils.isNotEmpty(eventDealDTO.getPics())){ + String[] pica = eventDealDTO.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(eventTransferRecordDO.getId()); + eventResourceDO.setCreateBy(eventDealDTO.getUserId()); + int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO); + if(picAdd!=1){ + throw new ServiceException("添加图片失败"); + } + } + } + return R.ok(); + }else{ + throw new ServiceException("处理事件记录出错"); + } + } + + @Override + public R verifyEvent(EventVerifyDTO eventVerifyDTO) { + EventDO eventDO = this.getBaseMapper().selectById(eventVerifyDTO.getId()); + boolean canVerifyByUser = eventDO.getEventProcessStatus()==3; + if(!canVerifyByUser){ + return R.fail("当前不是待验证状态"); + } + boolean processTypeRight = eventDO.getProcessType()==1; + if(!processTypeRight){ + return R.fail("当前处理对象不是网格员"); + } + + eventDO.setEventProcessStatus(2);//2已解决 + eventDO.setUpdateBy(eventVerifyDTO.getUserId()); + int updated = this.getBaseMapper().updateById(eventDO); + if(updated!=1){ + return R.fail("更新事件状态失败"); + } + EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO(); + eventTransferRecordDO.setFromType(1); + eventTransferRecordDO.setFromId(eventVerifyDTO.getUserId()); + eventTransferRecordDO.setFromName(eventVerifyDTO.getUserName()); + eventTransferRecordDO.setToType(1); + eventTransferRecordDO.setToId(eventVerifyDTO.getUserId()); + eventTransferRecordDO.setProcessDate(new Date()); + eventTransferRecordDO.setToName(eventVerifyDTO.getUserName()); + eventTransferRecordDO.setEventId(eventDO.getId()); + int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO); + if(inserted==1){ + return R.ok(); + }else{ + throw new ServiceException("事件处理添加出错"); + } + } + + @Override + public R republishEvent(EventRepublicDTO eventRepublicDTO) { + EventDO eventDO = this.getBaseMapper().selectById(eventRepublicDTO.getId()); + boolean canRepublishByUser = eventDO.getEventStatus()==4; + if(!canRepublishByUser){ + return R.fail("当前不是撤销状态"); + } + + eventDO.setEventStatus(2);//2已解决 + eventDO.setUpdateBy(eventRepublicDTO.getUserId()); + int updated = this.getBaseMapper().updateById(eventDO); + if(updated!=1){ + return R.fail("更新事件状态失败"); + } + EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO(); + eventTransferRecordDO.setFromType(1); + eventTransferRecordDO.setFromId(eventRepublicDTO.getUserId()); + eventTransferRecordDO.setFromName(eventRepublicDTO.getUserName()); + eventTransferRecordDO.setToType(1); + eventTransferRecordDO.setToId(eventRepublicDTO.getUserId()); + eventTransferRecordDO.setProcessDate(new Date()); + eventTransferRecordDO.setEventId(eventDO.getId()); + int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO); + if(inserted==1){ + return R.ok(); + }else{ + throw new ServiceException("事件处理添加出错"); + } + } + } -- Gitblit v1.7.1