From 57808b05a03d8b017604561a9ef82d65a03312b2 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:09:07 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 1130 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 969 insertions(+), 161 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 2a0b782..cf73689 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,16 +1,21 @@
package com.panzhihua.service_grid.service.impl;
+import com.alibaba.fastjson.JSONObject;
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.enums.EventType;
import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
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.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
@@ -28,9 +33,9 @@
import java.util.List;
/**
- * @auther lyq
- * @create 2021-04-14 15:03:01
- * @describe 订单表服务实现类
+ * @author cedoo
+ * 2021-04-14 15:03:01
+ * 订单表服务实现类
*/
@Slf4j
@Service
@@ -38,41 +43,15 @@
@Resource
private EventMapper eventMapper;
-
@Resource
private EventResourceService eventResourceService;
@Resource
private EventTransferRecordService eventTransferRecordService;
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
- /**
- * 新增事件
- * @param eventAddDTO
- * @return 新增结果
- */
- public R add(EventAddDTO eventAddDTO){
- EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(eventAddDTO, eventDO);
- eventDO.setCreateAt(new Date());
- if(eventMapper.insert(eventDO)>0){
- return R.ok();
- }
- return R.fail();
- }
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- public R edit(EventEditDTO eventEditDTO){
- EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(eventEditDTO, eventDO);
- //eventDO.setUpdateAt(new Date());
- if(eventMapper.updateById(eventDO)>0){
- return R.ok();
- }
- return R.fail();
- }
/**
* 分页查找事件
@@ -121,6 +100,12 @@
eventVO.setAudios(audioList);
eventVO.setPics(picList);
eventVO.setVideos(videoList);
+
+ //查询网格员头像
+ String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if(StringUtils.isNotEmpty(imageUrl)){
+ eventVO.setGridMemberImageUrl(imageUrl);
+ }
});
return R.ok(ipage);
}
@@ -129,11 +114,22 @@
/**
* 删除事件
- * @param EventDeleteDTO
+ * @param commonEventDeleteDTO
* @return 平台用户信息
*/
- public R delete(EventDeleteDTO EventDeleteDTO){
- return R.fail();
+ public R delete(CommonEventDeleteDTO commonEventDeleteDTO){
+ EventDO eventDO = eventMapper.selectById(commonEventDeleteDTO.getId());
+ if(eventDO==null){
+ return R.fail("事件不存在");
+ }
+ if(eventDO.getEventStatus()!=null &&
+ (eventDO.getEventStatus().intValue()==1||eventDO.getEventStatus().intValue()==4)){//草稿 或者 已撤销 的事件可以删除
+ eventDO.setEventStatus(3);//逻辑删除
+ eventDO.setUpdateBy(commonEventDeleteDTO.getUserId());
+ int updated = this.getBaseMapper().updateById(eventDO);
+ return updated==1?R.ok():R.fail();
+ }
+ return R.fail("事件不是草稿/已撤销/无效状态， 不允许删除");
}
/**
@@ -146,8 +142,12 @@
if(eventDO!=null) {
EventDetailsVO eventDetailsVO = new EventDetailsVO();
BeanUtils.copyProperties(eventDO, eventDetailsVO);
- //查询事件关联附件
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ if(eventGridDataDO!=null) {
+ eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+ }
+ //查询事件关联附件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
.eq(EventResourceDO::getClassification, 1)
@@ -185,6 +185,7 @@
List<EventTransferRecordDO> eventTransferRecordDOList = eventTransferRecordService.getBaseMapper()
.selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
.eq(EventTransferRecordDO::getEventId, id)
+ .orderByAsc(EventTransferRecordDO::getCreateAt)
);
List<EventTransferRecordVO> eventTransferRecordVOS = new ArrayList<>();
@@ -224,124 +225,144 @@
eventTransferRecordVOS.add(eventTransferRecordVO);
}
eventDetailsVO.setTrans(eventTransferRecordVOS);
+
+ //查询事件发布人头像
+ String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
+ if(StringUtils.isNotEmpty(imageUrl)){
+ eventDetailsVO.setGridMemberImageUrl(imageUrl);
+ }
+
return R.ok(eventDetailsVO);
}
- return R.fail();
+ return R.fail("事件不存在");
}
@Override
@Transactional(rollbackFor = Exception.class)
- public R addEmergencies(EmergenciesEventAddDTO emergenciesEventAddDTO) {
+ public R addCommon(CommonEventAddDTO commonEventAddDTO) {
EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(emergenciesEventAddDTO, eventDO);
- eventDO.setGridMemberId(emergenciesEventAddDTO.getUserId());
+ BeanUtils.copyProperties(commonEventAddDTO, eventDO);
+ if(commonEventAddDTO instanceof CommonEventCommunityAddDTO) {
+ CommonEventCommunityAddDTO commonEventCommunityAddDTO = (CommonEventCommunityAddDTO)commonEventAddDTO;
+ eventDO.setGridMemberId(commonEventCommunityAddDTO.getGridMemberId());
+ }else{
+ eventDO.setGridMemberId(commonEventAddDTO.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());
+ eventDO.setGridMemberName(commonEventAddDTO.getUserName());
+ eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
+ eventDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventDO.setSubmitDate(new Date());
if(eventMapper.insert(eventDO)==1){
//添加音频
- if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getAudio())){
+ if(StringUtils.isNotEmpty(commonEventAddDTO.getAudio())){
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(1);
eventResourceDO.setType(2);
- eventResourceDO.setUrl(emergenciesEventAddDTO.getAudio());
+ eventResourceDO.setUrl(commonEventAddDTO.getAudio());
eventResourceDO.setRefId(eventDO.getId());
- eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId());
+ eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(audioAdd!=1){
throw new ServiceException("添加音频失败");
}
}
//添加视频
- if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getVideo())){
+ if(StringUtils.isNotEmpty(commonEventAddDTO.getVideo())){
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(1);
eventResourceDO.setType(3);
- eventResourceDO.setUrl(emergenciesEventAddDTO.getVideo());
+ eventResourceDO.setUrl(commonEventAddDTO.getVideo());
eventResourceDO.setRefId(eventDO.getId());
- eventResourceDO.setCreateBy(emergenciesEventAddDTO.getUserId());
+ eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(videoAdd!=1){
throw new ServiceException("添加视频失败");
}
}
//添加图片
- if(StringUtils.isNotEmpty(emergenciesEventAddDTO.getPics())){
- String[] pica = emergenciesEventAddDTO.getPics().split(",");
+ if(StringUtils.isNotEmpty(commonEventAddDTO.getPics())){
+ String[] pica = commonEventAddDTO.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());
+ eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(picAdd!=1){
throw new ServiceException("添加图片失败");
}
}
}
+ addReleaseRecord(eventDO.getId(), commonEventAddDTO.getUserId(), commonEventAddDTO.getUserName());
return R.ok();
}
return R.fail();
}
@Override
- public R saveEmergenciesDraft(EmergenciesEventEditDTO emergenciesEventEditDTO) {
- if(emergenciesEventEditDTO.getId()==null) {
+ @Transactional(rollbackFor = Exception.class)
+ public R saveDraft(CommonEventEditDTO commonEventEditDTO) {
+ if(commonEventEditDTO.getId()==null) {
EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO);
- eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId());
+ BeanUtils.copyProperties(commonEventEditDTO, eventDO);
+ eventDO.setGridMemberId(commonEventEditDTO.getUserId());
eventDO.setEventCategory(1l);//办件事件
- eventDO.setEventType(5);//突发事件分类
eventDO.setEventStatus(1);//事件状态 1草稿
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
- eventDO.setCreateBy(emergenciesEventEditDTO.getUserId());
+ eventDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventDO.setGridMemberId(commonEventEditDTO.getUserId());
+ eventDO.setGridMemberName(commonEventEditDTO.getUserName());
+ eventDO.setGridMemberTelephone(commonEventEditDTO.getPhone());
+ eventDO.setEventDealStatus(5);
if (eventMapper.insert(eventDO) > 0) {
//添加音频
- if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getAudio())) {
+ if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(1);
eventResourceDO.setType(2);
eventResourceDO.setRefId(eventDO.getId());
- eventResourceDO.setUrl(emergenciesEventEditDTO.getAudio());
- eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
+ eventResourceDO.setUrl(commonEventEditDTO.getAudio());
+ eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
}
}
//添加视频
- if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getVideo())) {
+ if (StringUtils.isNotEmpty(commonEventEditDTO.getVideo())) {
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(1);
eventResourceDO.setType(3);
eventResourceDO.setRefId(eventDO.getId());
- eventResourceDO.setUrl(emergenciesEventEditDTO.getVideo());
- eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
+ eventResourceDO.setUrl(commonEventEditDTO.getVideo());
+ eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
}
}
//添加图片
- if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getPics())) {
- String[] pica = emergenciesEventEditDTO.getPics().split(",");
+ if (StringUtils.isNotEmpty(commonEventEditDTO.getPics())) {
+ String[] pica = commonEventEditDTO.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());
+ eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (picAdd != 1) {
throw new ServiceException("添加图片失败");
@@ -353,56 +374,61 @@
return R.fail();
}else{
//编辑原来的
- EventDO eventDO = eventMapper.selectById(emergenciesEventEditDTO.getId());
- BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO);
- eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId());
+ EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
+ if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
+ return R.fail("保存草稿失败，事件不是草稿状态");
+ }
+ BeanUtils.copyProperties(commonEventEditDTO, eventDO);
+ eventDO.setGridMemberId(commonEventEditDTO.getUserId());
eventDO.setEventCategory(1l);//办件事件
- eventDO.setEventType(5);//突发事件分类
eventDO.setEventStatus(1);//事件状态 2发布
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
- eventDO.setUpdateBy(emergenciesEventEditDTO.getUserId());
+ eventDO.setUpdateBy(commonEventEditDTO.getUserId());
+ eventDO.setEventDealStatus(5);
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())) {
+ if (StringUtils.isNotEmpty(commonEventEditDTO.getAudio())) {
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(1);
eventResourceDO.setType(2);
eventResourceDO.setRefId(eventDO.getId());
- eventResourceDO.setUrl(emergenciesEventEditDTO.getAudio());
- eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
+ eventResourceDO.setUrl(commonEventEditDTO.getAudio());
+ eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
}
}
//添加视频
- if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getVideo())) {
+ if (StringUtils.isNotEmpty(commonEventEditDTO.getVideo())) {
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(1);
eventResourceDO.setType(3);
eventResourceDO.setRefId(eventDO.getId());
- eventResourceDO.setUrl(emergenciesEventEditDTO.getVideo());
- eventResourceDO.setCreateBy(emergenciesEventEditDTO.getUserId());
+ eventResourceDO.setUrl(commonEventEditDTO.getVideo());
+ eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
}
}
//添加图片
- if (StringUtils.isNotEmpty(emergenciesEventEditDTO.getPics())) {
- String[] pica = emergenciesEventEditDTO.getPics().split(",");
+ if (StringUtils.isNotEmpty(commonEventEditDTO.getPics())) {
+ String[] pica = commonEventEditDTO.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());
+ eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (picAdd != 1) {
throw new ServiceException("添加图片失败");
@@ -417,8 +443,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R emergenciesReport(EmergenciesEventReportDTO emergenciesEventReportDTO) {
- EventDO eventDO = this.getBaseMapper().selectById(emergenciesEventReportDTO.getEventId());
+ public R report(CommonEventReportDTO commonEventReportDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventReportDTO.getEventId());
if(eventDO==null){
return R.fail("事件不存在");
}
@@ -428,45 +454,65 @@
if(eventDO.getProcessType()==2){
return R.fail("当前事件已交由社区处理");
}
+
+ R r = communityService.detailCommunity(commonEventReportDTO.getToId());
+ if(!R.isOk(r)){
+ return R.fail("社区不存在");
+ }
+ ComActVO comActVO= JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
+ if(comActVO==null){
+ return R.fail("社区不存在");
+ }
+ eventDO.setCommunityProcess(1); //社区处理
+ eventDO.setProcessType(2); //当前处理对象： 社区处理
eventDO.setCommunityProcess(1);
- eventDO.setProcessType(2);
- eventDO.setEventProcessStatus(1);
- eventDO.setUpdateBy(emergenciesEventReportDTO.getUserId());
+ eventDO.setEventProcessStatus(1); //待处理
+ eventDO.setUpdateBy(commonEventReportDTO.getUserId());
+ eventDO.setSubmitDate(new Date());
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();
+ addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult());
+ return R.ok();
+
}
@Override
+ @Transactional(rollbackFor = Exception.class)
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;
+ boolean canRevoke = eventDO.getEventStatus()==2; //发布状态
if(!canRevoke){
+ return R.fail("当前事件不允许撤销");
+ }
+ if(eventDO.getEventCategory()!=null && eventDO.getEventCategory().intValue()==2){//宣传教育事件
+ //不做验证
+ }else if(eventDO.getEventProcessStatus()==2 ||eventDO.getEventProcessStatus()==3) { //已解决 或者 待验证 不允许撤销
return R.fail("当前事件不允许撤销");
}
eventDO.setEventStatus(4);
eventDO.setUpdateBy(eventRevokeDTO.getUserId());
+ eventDO.setProcessType(1);//网格员处理
+ eventDO.setCommunityProcess(0);//非 社区处理
int updated = this.getBaseMapper().updateById(eventDO);
- return updated==1?R.ok():R.fail();
+ if(updated == 1){
+ addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1,"撤销成功");
+ return R.ok();
+ }
+ return R.fail();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public R dealEvent(EventDealDTO eventDealDTO) {
- EventDO eventDO = this.getBaseMapper().selectById(eventDealDTO.getId());
+ public R dealEvent(CommonEventDealDTO commonEventDealDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventDealDTO.getId());
+ if (eventDO == null) {
+ return R.fail("事件不存在");
+ }
boolean canDealByUser = eventDO.getEventStatus()==2 && eventDO.getEventProcessStatus()==1;
if(!canDealByUser){
if(eventDO.getEventStatus()!=2){
@@ -479,74 +525,84 @@
}
eventDO.setEventProcessStatus(2);//2已解决
- eventDO.setUpdateBy(eventDealDTO.getUserId());
+ eventDO.setUpdateBy(commonEventDealDTO.getUserId());
+
+ //更新处理信息
+ eventDO.setProcessUserId(commonEventDealDTO.getUserId());
+ eventDO.setProcessUserName(commonEventDealDTO.getUserName());
+ eventDO.setProcessDate(new Date());
+ eventDO.setProcessDesc(commonEventDealDTO.getProcessResult());
+
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){
+ EventTransferRecordDO transferRecordDO =
+ addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成");
+ if(transferRecordDO!=null && transferRecordDO.getId()!=null){
//添加音频
- if(StringUtils.isNotEmpty(eventDealDTO.getAudio())){
+ if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(3);
eventResourceDO.setType(2);
- eventResourceDO.setUrl(eventDealDTO.getAudio());
- eventResourceDO.setRefId(eventTransferRecordDO.getId());
- eventResourceDO.setCreateBy(eventDealDTO.getUserId());
+ eventResourceDO.setUrl(commonEventDealDTO.getAudio());
+ eventResourceDO.setRefId(transferRecordDO.getId());
+ eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventDealDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(audioAdd!=1){
throw new ServiceException("添加音频失败");
}
}
//添加视频
- if(StringUtils.isNotEmpty(eventDealDTO.getVideo())){
+ if(StringUtils.isNotEmpty(commonEventDealDTO.getVideo())){
EventResourceDO eventResourceDO = new EventResourceDO();
eventResourceDO.setClassification(3);
eventResourceDO.setType(3);
- eventResourceDO.setUrl(eventDealDTO.getVideo());
- eventResourceDO.setRefId(eventTransferRecordDO.getId());
- eventResourceDO.setCreateBy(eventDealDTO.getUserId());
+ eventResourceDO.setUrl(commonEventDealDTO.getVideo());
+ eventResourceDO.setRefId(transferRecordDO.getId());
+ eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventDealDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(videoAdd!=1){
throw new ServiceException("添加视频失败");
}
}
//添加图片
- if(StringUtils.isNotEmpty(eventDealDTO.getPics())){
- String[] pica = eventDealDTO.getPics().split(",");
+ if(StringUtils.isNotEmpty(commonEventDealDTO.getPics())){
+ String[] pica = commonEventDealDTO.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());
+ eventResourceDO.setRefId(transferRecordDO.getId());
+ eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(picAdd!=1){
throw new ServiceException("添加图片失败");
}
}
}
+
+ Long transferRecordId = transferRecordDO.getId();
+ EventDO eventDOToUpdate = this.getBaseMapper().selectById(commonEventDealDTO.getId());
+ eventDOToUpdate.setProcessRecordId(transferRecordId);
+ int transferRecordUpdated = this.getBaseMapper().updateById(eventDOToUpdate);
+ if(transferRecordUpdated!=1){
+ throw new ServiceException("更新事件处理流程失败");
+ }
+
return R.ok();
}else{
throw new ServiceException("处理事件记录出错");
}
}
+
@Override
- public R verifyEvent(EventVerifyDTO eventVerifyDTO) {
- EventDO eventDO = this.getBaseMapper().selectById(eventVerifyDTO.getId());
+ public R verifyEvent(CommonEventVerifyDTO commonEventVerifyDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventVerifyDTO.getId());
boolean canVerifyByUser = eventDO.getEventProcessStatus()==3;
if(!canVerifyByUser){
return R.fail("当前不是待验证状态");
@@ -557,56 +613,808 @@
}
eventDO.setEventProcessStatus(2);//2已解决
- eventDO.setUpdateBy(eventVerifyDTO.getUserId());
+ eventDO.setUpdateBy(commonEventVerifyDTO.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("事件处理添加出错");
- }
+ addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, "事件验证完成");
+ return R.ok();
}
@Override
- public R republishEvent(EventRepublicDTO eventRepublicDTO) {
- EventDO eventDO = this.getBaseMapper().selectById(eventRepublicDTO.getId());
+ public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
boolean canRepublishByUser = eventDO.getEventStatus()==4;
if(!canRepublishByUser){
return R.fail("当前不是撤销状态");
}
- eventDO.setEventStatus(2);//2已解决
- eventDO.setUpdateBy(eventRepublicDTO.getUserId());
+ eventDO.setEventStatus(2);//2 发布
+ eventDO.setEventProcessStatus(1); //待解决
+ eventDO.setProcessType(1); //网格员处理
+ eventDO.setUpdateBy(commonEventRepublishDTO.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();
+ addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件");
+ return R.ok();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R draftRelease(CommonEventPublicDTO commonEventPublicDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventPublicDTO.getId());
+ boolean draftCanRelease = eventDO.getEventStatus()==1;
+ if(!draftCanRelease){
+ return R.fail("当前不是草稿状态");
+ }
+ eventDO.setEventStatus(2);//事件状态 2发布
+ eventDO.setProcessType(1);//当前处理对象类型:网格员处理
+ eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setEventProcessStatus(1);//待处理
+ eventDO.setUpdateBy(commonEventPublicDTO.getUserId());
+ int updated = this.getBaseMapper().updateById(eventDO);
+ if(updated!=1){
+ return R.fail("更新事件状态失败");
+ }
+ addReleaseRecord(eventDO.getId(), commonEventPublicDTO.getUserId(), commonEventPublicDTO.getUserName());
+ return R.ok();
+ }
+
+ @Override
+ public R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO) {
+ R rtVal = R.fail();
+ if(specialEventEditDTO.getId()==null) {
+ EventDO eventDO = new EventDO();
+ BeanUtils.copyProperties(specialEventEditDTO, eventDO);
+ eventDO.setGridMemberId(specialEventEditDTO.getUserId());
+ eventDO.setEventCategory(1l);//办件事件
+ eventDO.setEventType(EventType.SPECIAL);//特殊人群信息上报-事件分类
+ eventDO.setEventStatus(1);//事件状态 1草稿
+ eventDO.setProcessType(1);//网格员处理
+ eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventDO.setEventDealStatus(5);//草稿状态
+ if (eventMapper.insert(eventDO) > 0) {
+ //添加音频
+ if (StringUtils.isNotEmpty(specialEventEditDTO.getAudio())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(2);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(specialEventEditDTO.getAudio());
+ eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (audioAdd != 1) {
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if (StringUtils.isNotEmpty(specialEventEditDTO.getVideo())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(3);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(specialEventEditDTO.getVideo());
+ eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (videoAdd != 1) {
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if (StringUtils.isNotEmpty(specialEventEditDTO.getPics())) {
+ String[] pica = specialEventEditDTO.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(specialEventEditDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (picAdd != 1) {
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ rtVal = R.ok();
+ }
+ rtVal = R.fail();
}else{
- throw new ServiceException("事件处理添加出错");
+ //编辑原来的
+ EventDO eventDO = eventMapper.selectById(specialEventEditDTO.getId());
+ BeanUtils.copyProperties(specialEventEditDTO, eventDO);
+ eventDO.setGridMemberId(specialEventEditDTO.getUserId());
+ eventDO.setEventCategory(1l);//办件事件
+ eventDO.setEventStatus(1);//事件状态 1草稿
+ eventDO.setProcessType(1);//网格员处理
+ eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setUpdateBy(specialEventEditDTO.getUserId());
+ eventDO.setEventDealStatus(5);//草稿状态
+ 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(specialEventEditDTO.getAudio())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(2);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(specialEventEditDTO.getAudio());
+ eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (audioAdd != 1) {
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if (StringUtils.isNotEmpty(specialEventEditDTO.getVideo())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(3);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(specialEventEditDTO.getVideo());
+ eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (videoAdd != 1) {
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if (StringUtils.isNotEmpty(specialEventEditDTO.getPics())) {
+ String[] pica = specialEventEditDTO.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(specialEventEditDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (picAdd != 1) {
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ rtVal = R.ok();
+ }
+ rtVal = R.fail();
+ }
+ if(R.isOk(rtVal)){
+ //TODO 处理特殊人群实有人口数据
+
+ }
+ return rtVal;
+ }
+
+ @Override
+ public R addSpecial(SpecialEventAddDTO specialEventAddDTO) {
+ R rtVal = R.fail();
+ EventDO eventDO = new EventDO();
+ BeanUtils.copyProperties(specialEventAddDTO, eventDO);
+ eventDO.setGridMemberId(specialEventAddDTO.getUserId());
+ eventDO.setEventCategory(1l);//办件事件
+ eventDO.setEventType(EventType.SPECIAL);//特殊人群信息上报-事件分类
+ eventDO.setEventStatus(2);//事件状态 2发布
+ eventDO.setProcessType(1);//网格员处理
+ eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setCreateBy(specialEventAddDTO.getUserId());
+ if (eventMapper.insert(eventDO) > 0) {
+ //添加音频
+ if (StringUtils.isNotEmpty(specialEventAddDTO.getAudio())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(2);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(specialEventAddDTO.getAudio());
+ eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventAddDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (audioAdd != 1) {
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if (StringUtils.isNotEmpty(specialEventAddDTO.getVideo())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(3);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(specialEventAddDTO.getVideo());
+ eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventAddDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (videoAdd != 1) {
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if (StringUtils.isNotEmpty(specialEventAddDTO.getPics())) {
+ String[] pica = specialEventAddDTO.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(specialEventAddDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (picAdd != 1) {
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ rtVal = R.ok();
+ }
+ rtVal = R.fail();
+
+ if(R.isOk(rtVal)){
+ //TODO 处理特殊人群实有人口数据
+
+ addReleaseRecord(eventDO.getId(), specialEventAddDTO.getUserId(), specialEventAddDTO.getUserName());
+ return R.ok();
+ }
+ return rtVal;
+ }
+
+ @Override
+ public R getSpecialPopulation(String idCard) {
+ ComMngPopulationDTO comMngPopulationDTO = new ComMngPopulationDTO();
+ comMngPopulationDTO.setCardNo(idCard);
+ comMngPopulationDTO.setPageSize(10l);
+ comMngPopulationDTO.setPageNum(1l);
+ return communityService.pagePopulation(comMngPopulationDTO);
+ }
+
+ @Override
+ public R addPublicity(PublicityEventAddDTO publicityEventAddDTO) {
+ EventDO eventDO = new EventDO();
+ BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
+ eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
+ eventDO.setEventCategory(2l);//宣传事件
+ eventDO.setEventStatus(2);//事件状态 2发布
+ eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
+ eventDO.setGridMemberName(publicityEventAddDTO.getUserName());
+ eventDO.setGridMemberTelephone(publicityEventAddDTO.getPhone());
+ eventDO.setCreateBy(publicityEventAddDTO.getUserId());
+ if(eventMapper.insert(eventDO)==1){
+ //添加音频
+ if(StringUtils.isNotEmpty(publicityEventAddDTO.getAudio())){
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(2);
+ eventResourceDO.setUrl(publicityEventAddDTO.getAudio());
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventAddDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if(audioAdd!=1){
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if(StringUtils.isNotEmpty(publicityEventAddDTO.getVideo())){
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(3);
+ eventResourceDO.setUrl(publicityEventAddDTO.getVideo());
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventAddDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if(videoAdd!=1){
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if(StringUtils.isNotEmpty(publicityEventAddDTO.getPics())){
+ String[] pica = publicityEventAddDTO.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(publicityEventAddDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if(picAdd!=1){
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ addReleaseRecord(eventDO.getId(), publicityEventAddDTO.getUserId(), publicityEventAddDTO.getUserName());
+ return R.ok();
+ }
+ return R.fail();
+
+ }
+
+ @Override
+ public R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO) {
+ if(publicityEventEditDTO.getId()==null) {
+ EventDO eventDO = new EventDO();
+ BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
+ eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
+ eventDO.setEventCategory(2l);//宣传事件
+ eventDO.setEventStatus(1);//事件状态 1草稿
+ eventDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
+ eventDO.setGridMemberName(publicityEventEditDTO.getUserName());
+ eventDO.setGridMemberTelephone(publicityEventEditDTO.getPhone());
+ eventDO.setEventDealStatus(5);//草稿状态
+ if (eventMapper.insert(eventDO) > 0) {
+ //添加音频
+ if (StringUtils.isNotEmpty(publicityEventEditDTO.getAudio())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(2);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
+ eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (audioAdd != 1) {
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if (StringUtils.isNotEmpty(publicityEventEditDTO.getVideo())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(3);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
+ eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (videoAdd != 1) {
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if (StringUtils.isNotEmpty(publicityEventEditDTO.getPics())) {
+ String[] pica = publicityEventEditDTO.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(publicityEventEditDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (picAdd != 1) {
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ return R.ok();
+ }
+ return R.fail();
+ }else{
+ //编辑原来的
+ EventDO eventDO = eventMapper.selectById(publicityEventEditDTO.getId());
+ if(eventDO.getEventStatus()!=null && eventDO.getEventStatus()!=1){
+ return R.fail("保存草稿失败，事件不是草稿状态");
+ }
+ BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
+ eventDO.setGridMemberId(publicityEventEditDTO.getUserId());
+ eventDO.setEventCategory(2L);//宣传事件
+ eventDO.setEventStatus(1);//事件状态 1草稿
+ eventDO.setProcessType(1);//网格员处理
+ eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setUpdateBy(publicityEventEditDTO.getUserId());
+ eventDO.setEventDealStatus(5);//草稿状态
+ 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(publicityEventEditDTO.getAudio())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(2);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
+ eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (audioAdd != 1) {
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if (StringUtils.isNotEmpty(publicityEventEditDTO.getVideo())) {
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(1);
+ eventResourceDO.setType(3);
+ eventResourceDO.setRefId(eventDO.getId());
+ eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
+ eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (videoAdd != 1) {
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if (StringUtils.isNotEmpty(publicityEventEditDTO.getPics())) {
+ String[] pica = publicityEventEditDTO.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(publicityEventEditDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if (picAdd != 1) {
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ return R.ok();
+ }
+ return R.fail();
}
}
+ @Override
+ public R selectPublicity(PagePublicityEventDTO 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.findPublicityByPage(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();
+ }
+
+ @Override
+ public R<ComActVO> actList() {
+ return communityService.listCommunityAll();
+ }
+
+ @Override
+ public R eventToManage(PageEventManageDTO pageEventManageDTO) {
+ //查询管理事件
+ Page page = new Page(1,10);
+ if(pageEventManageDTO.getPageNum()!=null) {
+ page.setCurrent(pageEventManageDTO.getPageNum());
+ }
+ if(pageEventManageDTO.getPageSize()!=null) {
+ page.setSize(pageEventManageDTO.getPageSize());
+ }
+ IPage<EventVO> ipage = eventMapper.findToManageByPage(page, pageEventManageDTO);
+ 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);
+
+ //查询网格员头像
+ String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if(StringUtils.isNotEmpty(imageUrl)){
+ eventVO.setGridMemberImageUrl(imageUrl);
+ }
+ });
+ return R.ok(ipage);
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R markEventInvalid(EventRevokeDTO eventRevokeDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(eventRevokeDTO.getId());
+ if(eventDO==null){
+ return R.fail("事件不存在");
+ }
+ boolean canRevoke = eventDO.getEventDealStatus()==3; //发布状态
+ if(!canRevoke){
+ 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,"撤销成功");
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R republishInvalidEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
+ if(eventDO==null){
+ return R.fail("事件不存在");
+ }
+ boolean canRepulish = eventDO.getEventDealStatus()==7; //已失效状态
+ if(!canRepulish){
+ return R.fail("当前事件不是已失效状态，不能重新发布");
+ }
+ eventDO.setInvalid(true);
+ int updated = this.getBaseMapper().updateById(eventDO);
+ if(updated == 1){
+ addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功");
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R communityDealEvent(CommonEventDealDTO commonEventDealDTO) {
+ EventDO eventDO = this.getBaseMapper().selectById(commonEventDealDTO.getId());
+ if (eventDO == null) {
+ return R.fail("事件不存在");
+ }
+ boolean canDealByCommunity = eventDO.getEventDealStatus() == 3;
+ if(!canDealByCommunity){
+ return R.fail("事件当前不是上报状态");
+ }
+
+ if(commonEventDealDTO.getNeedVerify()){
+ eventDO.setEventProcessStatus(3);//待验证状态
+ eventDO.setProcessType(1);//交给网格员处理-验证
+ }else {
+ eventDO.setEventProcessStatus(2);//2已解决
+ }
+ eventDO.setUpdateBy(commonEventDealDTO.getUserId());
+
+ //更新处理信息
+ eventDO.setProcessUserId(commonEventDealDTO.getUserId());
+ eventDO.setProcessUserName(commonEventDealDTO.getUserName());
+ eventDO.setProcessDate(new Date());
+ eventDO.setProcessDesc(commonEventDealDTO.getProcessResult());
+
+ int updated = this.getBaseMapper().updateById(eventDO);
+ if(updated!=1){
+ return R.fail("更新事件状态失败");
+ }
+ EventTransferRecordDO transferRecordDO =
+ addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成");
+ if(transferRecordDO!=null && transferRecordDO.getId()!=null){
+ //添加音频
+ if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(3);
+ eventResourceDO.setType(2);
+ eventResourceDO.setUrl(commonEventDealDTO.getAudio());
+ eventResourceDO.setRefId(transferRecordDO.getId());
+ eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventDealDTO.getAudioTime());
+ int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if(audioAdd!=1){
+ throw new ServiceException("添加音频失败");
+ }
+ }
+ //添加视频
+ if(StringUtils.isNotEmpty(commonEventDealDTO.getVideo())){
+ EventResourceDO eventResourceDO = new EventResourceDO();
+ eventResourceDO.setClassification(3);
+ eventResourceDO.setType(3);
+ eventResourceDO.setUrl(commonEventDealDTO.getVideo());
+ eventResourceDO.setRefId(transferRecordDO.getId());
+ eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventDealDTO.getVideoTime());
+ int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if(videoAdd!=1){
+ throw new ServiceException("添加视频失败");
+ }
+ }
+ //添加图片
+ if(StringUtils.isNotEmpty(commonEventDealDTO.getPics())){
+ String[] pica = commonEventDealDTO.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(transferRecordDO.getId());
+ eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
+ if(picAdd!=1){
+ throw new ServiceException("添加图片失败");
+ }
+ }
+ }
+ Long transferRecordId = transferRecordDO.getId();
+ EventDO eventDOToUpdate = this.getBaseMapper().selectById(commonEventDealDTO.getId());
+ eventDOToUpdate.setProcessRecordId(transferRecordId);
+ int transferRecordUpdated = this.getBaseMapper().updateById(eventDOToUpdate);
+ if(transferRecordUpdated!=1){
+ throw new ServiceException("更新事件处理流程失败");
+ }
+ return R.ok();
+ }else{
+ throw new ServiceException("处理事件记录出错");
+ }
+ }
+
+ /**
+ * 添加发布事件流转记录
+ * @param eventId 事件ID
+ * @param userId 操作用户ID
+ * @param userName 操作用户姓名
+ * @return 添加成功返回true， 否则返回false
+ */
+ private EventTransferRecordDO addReleaseRecord(Long eventId, Long userId, String userName){
+ EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
+ eventTransferRecordDO.setFromType(1);
+ eventTransferRecordDO.setFromId(userId);
+ eventTransferRecordDO.setFromName(userName);
+ eventTransferRecordDO.setToType(1);
+ eventTransferRecordDO.setToId(userId);
+ eventTransferRecordDO.setToName(userName);
+ eventTransferRecordDO.setProcessDate(new Date());
+ eventTransferRecordDO.setEventId(eventId);
+ eventTransferRecordDO.setProcessResult("发布成功");
+ int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
+ if(inserted!=1){
+ throw new ServiceException("事件流转记录添加失败");
+ }
+ this.updateEventDealStatus(eventId);
+ return eventTransferRecordDO;
+ }
+
+ /**
+ * 查询最后的流转记录，并添加事件流转记录
+ * @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){
+ List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
+ .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());
+ eventTransferRecordDO.setToType(toType);
+ eventTransferRecordDO.setToId(toId);
+ eventTransferRecordDO.setProcessDate(new Date());
+ eventTransferRecordDO.setToName(toName);
+ eventTransferRecordDO.setEventId(eventId);
+ eventTransferRecordDO.setProcessResult(msg);
+ int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
+ if(inserted==1) {
+ this.updateEventDealStatus(eventId);
+ return eventTransferRecordDO;
+ }else{
+ throw new ServiceException("事件流转记录添加失败");
+ }
+ }
+
+ /**
+ * 根据子状态 查询用户事件处理状态
+ * @param eventId 事件ID
+ */
+ private EventDO updateEventDealStatus(Long eventId){
+ EventDO eventDO = this.getBaseMapper().selectById(eventId);
+ Integer eventDealStatus = getEventDealStatus(eventDO);
+ eventDO.setEventDealStatus(eventDealStatus);
+ int updated = this.getBaseMapper().updateById(eventDO);
+ if(updated == 1){
+ return eventDO;
+ }else{
+ throw new ServiceException("更新事件处理状态错误");
+ }
+ }
+
+ /**
+ * 根据子状态 查询用户事件处理状态
+ * @param eventDO 事件
+ */
+ private Integer getEventDealStatus(EventDO eventDO){
+ Integer event_status = eventDO.getEventStatus();
+ Integer event_process_status = eventDO.getEventProcessStatus();
+ Integer process_type = eventDO.getProcessType();
+ Integer community_process = eventDO.getCommunityProcess();
+
+ Integer eventDealStatus = -1;
+ //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
+ if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
+ eventDealStatus = 7;//7已失效
+ }else if(event_status ==2 && event_process_status == 1 && process_type == 1) {
+ eventDealStatus = 1;//"待处理"
+ }else if( event_process_status == 3) {
+ eventDealStatus = 2;//"待验证"
+ }else if(event_status == 2 && community_process == 1 && process_type == 2) {
+ eventDealStatus=3;//"已上报"
+ }else if( event_process_status == 2 ) {
+ eventDealStatus=4;//"已解决"
+ }else if( event_status == 1 ) {
+ eventDealStatus = 5;//"草稿箱"
+ }else if( event_status == 4 ) {
+ eventDealStatus=6;//"已撤销"
+ }
+ return eventDealStatus;
+ }
}
--
Gitblit v1.7.1