From 9cfd18f1e6ebfeb94030e3a907cd5e79e51a0780 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 05 六月 2021 21:40:15 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 264 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 220 insertions(+), 44 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 9a60096..d927b3f 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
@@ -28,6 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -51,13 +52,15 @@
private CommunityService communityService;
@Resource
private EventGridDataMapper eventGridDataMapper;
-
+ @Resource
+ private EventGridMemberRelationMapper eventGridMemberRelationMapper;
/**
* 分页查找事件
* @param pageEventDTO
* @return 维护结果
*/
+ @Override
public R<IPage<EventVO>> query(PageEventDTO pageEventDTO){
Page page = new Page(1,10);
if(pageEventDTO.getPageNum()!=null) {
@@ -117,6 +120,7 @@
* @param commonEventDeleteDTO
* @return 平台用户信息
*/
+ @Override
public R delete(CommonEventDeleteDTO commonEventDeleteDTO){
EventDO eventDO = eventMapper.selectById(commonEventDeleteDTO.getId());
if(eventDO==null){
@@ -137,6 +141,7 @@
* @param id 事件 id
* @return 查找结果
*/
+ @Override
public R<EventDetailsVO> eventDetails(Long id){
EventDO eventDO = eventMapper.selectById(id);
if(eventDO!=null) {
@@ -248,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);//网格员处理
@@ -257,6 +266,7 @@
eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
eventDO.setCreateBy(commonEventAddDTO.getUserId());
eventDO.setSubmitDate(new Date());
+ eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
if(eventMapper.insert(eventDO)==1){
//添加音频
if(StringUtils.isNotEmpty(commonEventAddDTO.getAudio())){
@@ -311,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);
@@ -375,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());
@@ -473,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();
}
@@ -487,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);
@@ -500,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();
@@ -537,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())){
@@ -618,7 +638,8 @@
if(updated!=1){
return R.fail("更新事件状态失败");
}
- addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, "事件验证完成");
+ addTransferRecord(eventDO.getId(), commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 1, commonEventVerifyDTO.getProcessResult(),
+ commonEventVerifyDTO.getUserId(), commonEventVerifyDTO.getUserName(), 6);
return R.ok();
}
@@ -638,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();
}
@@ -650,6 +671,7 @@
if(!draftCanRelease){
return R.fail("当前不是草稿状态");
}
+ eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
eventDO.setEventStatus(2);//事件状态 2发布
eventDO.setProcessType(1);//当前处理对象类型:网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
@@ -663,8 +685,28 @@
return R.ok();
}
+ /**
+ * 生成服务单号
+ * @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);
+ return orderSn;
+ }
+
@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();
@@ -798,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);
@@ -808,6 +854,7 @@
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
eventDO.setCreateBy(specialEventAddDTO.getUserId());
+ eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
if (eventMapper.insert(eventDO) > 0) {
//添加音频
if (StringUtils.isNotEmpty(specialEventAddDTO.getAudio())) {
@@ -877,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());
@@ -886,6 +937,7 @@
eventDO.setGridMemberName(publicityEventAddDTO.getUserName());
eventDO.setGridMemberTelephone(publicityEventAddDTO.getPhone());
eventDO.setCreateBy(publicityEventAddDTO.getUserId());
+ eventDO.setOrderSn(getEventOrderSn(eventDO.getEventType()));
if(eventMapper.insert(eventDO)==1){
//添加音频
if(StringUtils.isNotEmpty(publicityEventAddDTO.getAudio())){
@@ -940,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);
@@ -1002,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());
@@ -1184,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();
@@ -1214,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();
@@ -1250,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())){
@@ -1309,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
@@ -1327,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("事件流转记录添加失败");
@@ -1334,6 +1454,7 @@
this.updateEventDealStatus(eventId);
return eventTransferRecordDO;
}
+
/**
* 查询最后的流转记录，并添加事件流转记录
@@ -1344,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)
@@ -1363,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);
@@ -1370,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);
}
/**
@@ -1393,35 +1531,73 @@
* @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();
+ //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效、8已发布
+ if(eventDO.getEventCategory()!=null) {
+ if (eventDO.getEventCategory() == 1) {
+ Integer event_status = eventDO.getEventStatus()!=null?eventDO.getEventStatus():-1;
+ Integer event_process_status = eventDO.getEventProcessStatus()!=null?eventDO.getEventProcessStatus():-1;
+ Integer process_type = eventDO.getProcessType()!=null?eventDO.getProcessType():-1;
+ Integer community_process = eventDO.getCommunityProcess()!=null?eventDO.getCommunityProcess():-1;
- Integer eventDealStatus = -1;
- //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销、7已失效
- if(eventDO.getInvalid()!=null && eventDO.getInvalid()==false){
- eventDealStatus = 7;//7已失效
- }else if(event_status!=null && event_status ==2 && event_process_status!=null && event_process_status == 1
- && process_type!=null && process_type == 1) {
- eventDealStatus = 1;//"待处理"
- }else if( event_process_status!=null && event_process_status == 3) {
- eventDealStatus = 2;//"待验证"
- }else if(event_status!=null && event_status == 2 && community_process!=null
- && community_process == 1 && process_type!=null && process_type == 2) {
- eventDealStatus=3;//"已上报"
- }else if( event_process_status!=null && event_process_status == 2 ) {
- eventDealStatus=4;//"已解决"
- }else if( event_status!=null && event_status == 1 ) {
- eventDealStatus = 5;//"草稿箱"
- }else if( event_status!=null && event_status == 4 ) {
- eventDealStatus=6;//"已撤销"
+ Integer eventDealStatus = -1;
+ if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
+ eventDealStatus = 7;
+ //7已失效
+ } else if (event_status == 1) {
+ eventDealStatus = 5;
+ //"草稿箱"
+ } else if ( event_status == 4) {
+ eventDealStatus = 6;
+ //"已撤销"
+ } else if (event_status ==2){
+ if (event_process_status == 3) {
+ eventDealStatus = 2;
+ //"待验证"
+ }else if (event_process_status == 2) {
+ eventDealStatus = 4;
+ //"已解决"
+ }else if ( community_process == 1 && process_type == 2) {
+ eventDealStatus = 3;
+ //"已上报"
+ }else if ( event_process_status == 1 && process_type == 1) {
+ eventDealStatus = 1;
+ //"待处理"
+ }
+ }
+ return eventDealStatus;
+ } else if (eventDO.getEventCategory() == 2) {
+ Integer event_status = eventDO.getEventStatus();
+ if (event_status != null && event_status == 1) {
+ return 5;
+ //"草稿箱"
+ } else if (event_status != null && event_status == 2) {
+ return 8;
+ //已发布
+ } else if (event_status != null && event_status == 4) {
+ return 6;
+ //"已撤销"
+ }
+ }
}
- return eventDealStatus;
+ 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));
+ }
}
--
Gitblit v1.7.1