From f0d625c9af19c556c5d2e70967dbd3b3093608dc Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 22 六月 2021 17:04:01 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 122 +++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 27 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 ce37efe..ac69938 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
@@ -2,17 +2,21 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.community.bigscreen.event.ScreenEventListDTO;
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.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ExcelSelectListUtil;
import com.panzhihua.common.utlis.LngLatUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
@@ -25,12 +29,11 @@
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* @author cedoo
@@ -55,6 +58,8 @@
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
@Resource
private EventGridDataService eventGridDataService;
+ @Resource
+ private EventResourceMapper eventResourceMapper;
/**
* 分页查找事件
@@ -234,10 +239,17 @@
}
eventDetailsVO.setTrans(eventTransferRecordVOS);
- //查询事件发布人头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventDetailsVO.setGridMemberImageUrl(imageUrl);
+ //查询网格员头像,姓名
+ Map<String,Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
+ if (!CollectionUtils.isEmpty(gridMember)) {
+ eventDetailsVO.setGridMemberName(gridMember.get("name") == null ? "" : gridMember.get("name").toString());
+ eventDetailsVO.setGridMemberImageUrl(gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
+ }
+ if(Objects.equals(eventDO.getGridMemberId(),eventDO.getCreateBy())){
+ eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
+ }else{
+ Map<String,Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
+ eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString());
}
return R.ok(eventDetailsVO);
@@ -280,6 +292,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
+ eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/")+1));
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -294,6 +307,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
+ eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/")+1));
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -309,6 +323,7 @@
eventResourceDO.setUrl(pica[i]);
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/")+1));
int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (picAdd != 1) {
throw new ServiceException("添加图片失败");
@@ -515,6 +530,8 @@
eventDO.setUpdateBy(eventRevokeDTO.getUserId());
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
+ eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
int updated = this.getBaseMapper().updateById(eventDO);
if (updated == 1) {
addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
@@ -531,10 +548,10 @@
if (eventDO == null) {
return R.fail("事件不存在");
}
- boolean canDealByUser = eventDO.getEventStatus() == 2 && eventDO.getEventProcessStatus() == 1;
+ boolean canDealByUser = (eventDO.getEventStatus() == 2||eventDO.getEventStatus()==4) && eventDO.getEventProcessStatus() == 1;
if (!canDealByUser) {
- if (eventDO.getEventStatus() != 2) {
- return R.fail("事件不是发布状态");
+ if (eventDO.getEventStatus() != 2 ) {
+ return R.fail("事件不是发布/待处理状态");
}
if (eventDO.getEventProcessStatus() != 1) {
return R.fail("事件不是待处理状态");
@@ -650,7 +667,8 @@
@Override
public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
- boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
+ //boolean canRepublishByUser = eventDO.getEventStatus() == 4 || eventDO.getEventStatus() == 1;
+ boolean canRepublishByUser = eventDO.getEventDealStatus() == 7|eventDO.getEventDealStatus() == 5; //已失效状态
if (!canRepublishByUser) {
return R.fail("当前不是撤销/草稿状态");
}
@@ -1179,6 +1197,11 @@
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);
}
@@ -1256,12 +1279,12 @@
if (eventDO.getEventCategory() == 1) {
boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
if (!canRevoke) {
- return R.fail("当前事件不是上报状态，不允许标为无效");
+ return R.fail("当前事件不是上报状态，不允许撤销");
}
} else if (eventDO.getEventCategory() == 2) {
boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
if (!canRevoke) {
- return R.fail("当前事件不是发布状态，不允许标为无效");
+ return R.fail("当前事件不是发布状态，不允许撤销");
}
} else {
return R.fail("");
@@ -1275,6 +1298,8 @@
eventDO.setEventStatus(4);//4、撤销
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
+ eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
int updated = this.getBaseMapper().updateById(eventDO);
if (updated == 1) {
addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1, "标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName(), 4);
@@ -1504,14 +1529,13 @@
.eq(EventTransferRecordDO::getEventId, eventId)
.orderByDesc(EventTransferRecordDO::getCreateAt)
);
- if (list == null || list.size() == 0) {
- throw new ServiceException("事件流转记录异常");
- }
- EventTransferRecordDO lastRecord = list.get(0);
EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
- eventTransferRecordDO.setFromType(lastRecord.getToType());
- eventTransferRecordDO.setFromId(lastRecord.getToId());
- eventTransferRecordDO.setFromName(lastRecord.getToName());
+ if (list != null && list.size() > 0) {
+ EventTransferRecordDO lastRecord = list.get(0);
+ eventTransferRecordDO.setFromType(lastRecord.getToType());
+ eventTransferRecordDO.setFromId(lastRecord.getToId());
+ eventTransferRecordDO.setFromName(lastRecord.getToName());
+ }
eventTransferRecordDO.setToType(toType);
eventTransferRecordDO.setToId(toId);
eventTransferRecordDO.setProcessDate(new Date());
@@ -1576,10 +1600,11 @@
Integer community_process = eventDO.getCommunityProcess() != null ? eventDO.getCommunityProcess() : -1;
Integer eventDealStatus = -1;
- if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
+ /*if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
eventDealStatus = 7;
//7已失效
- } else if (event_status == 1) {
+ }*/
+ if (event_status == 1) {
eventDealStatus = 5;
//"草稿箱"
} else if (event_status == 4) {
@@ -1644,7 +1669,7 @@
public R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO) {
Page page = new Page(pageEventGridNearbyDTO.getPageNum(), pageEventGridNearbyDTO.getPageSize());
String latLng = pageEventGridNearbyDTO.getHappentLatLng();
- if(!latLng.matches("^[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?),[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10})$")){
+ if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){
return R.fail("经纬度参数错误");
}
String latLngArr[] = latLng.split(",");
@@ -1771,15 +1796,15 @@
throw new ServiceException("id为" + id + "的事件不存在");
}
if (eventDO.getEventCategory() != null) {
- if (eventDO.getEventCategory() == 1) {
+ if (eventDO.getEventCategory() == 1) {//
boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
if (!canRevoke) {
- throw new ServiceException("当前事件不是上报状态，不允许标为无效");
+ throw new ServiceException("当前事件不是上报状态，不允许撤销");
}
- } else if (eventDO.getEventCategory() == 2) {
+ } else if (eventDO.getEventCategory() == 2) {//宣传教育
boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
if (!canRevoke) {
- throw new ServiceException("当前事件不是发布状态，不允许标为无效");
+ throw new ServiceException("当前事件不是发布状态，不允许撤销");
}
} else {
throw new ServiceException("事件分类错误");
@@ -2037,4 +2062,47 @@
return R.fail();
}
+
+ /**
+ * 事件大屏查询事件列表
+ * @param eventListDTO 请求参数
+ * @return 事件列表
+ */
+ @Override
+ public R getScreenEventList(ScreenEventListDTO eventListDTO) {
+ if (eventListDTO.getEventType() != null && eventListDTO.getEventType().equals(ScreenEventListDTO.eventType.xc)) {
+ eventListDTO.setEventCategory(2);
+ }
+ IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(), eventListDTO.getPageSize()), eventListDTO);
+ return R.ok(eventPageList);
+ }
+
+ @Override
+ public List<EventDetailsVO> getUnUploadEvent() {
+ List<EventDetailsVO> eventDetailsVOList =new ArrayList<>();
+ List<EventDO> unEventList = baseMapper.selectList(
+ new QueryWrapper<EventDO>()
+ .eq("upload", false)
+ );
+ unEventList.forEach(eventDO -> {
+ eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
+ });
+ return eventDetailsVOList;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean updateLcUploadFlag(Long id) {
+ EventDO event = baseMapper.selectById(id);
+ event.setUpload(true);
+ baseMapper.updateById(event);
+ EventResourceDO eventResourceDO =new EventResourceDO();
+ eventResourceDO.setUpload(true);
+ int flag = eventResourceMapper.update(eventResourceDO, new QueryWrapper<EventResourceDO>()
+ .eq("ref_id", id));
+ if(flag>0){
+ return true;
+ }
+ return false;
+ }
}
--
Gitblit v1.7.1