From 1fbdd1f48a5ec551a4c044d4babd95633e36d62e Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 03 六月 2021 21:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 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 8f1a41f..1a69bc8 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
@@ -49,36 +49,9 @@
private EventTransferRecordService eventTransferRecordService;
@Resource
private CommunityService communityService;
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
- /**
- * 新增事件
- * @param eventAddDTO 事件新增DTO
- * @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();
- }
/**
* 分页查找事件
@@ -163,6 +136,32 @@
if(eventDO!=null) {
EventDetailsVO eventDetailsVO = new EventDetailsVO();
BeanUtils.copyProperties(eventDO, eventDetailsVO);
+
+ 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已撤销
+ 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 == 1 && community_process == 1 ) {
+ eventDealStatus=3;//"已上报"
+ }else if( event_process_status == 2 ) {
+ eventDealStatus=4;//"已解决"
+ }else if( event_status == 1 ) {
+ eventDealStatus = 5;//"草稿箱"
+ }else if( event_status == 4 ) {
+ eventDealStatus=6;//"已撤销"
+ }
+ eventDetailsVO.setEventDealStatus(eventDealStatus);
+
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+
//查询事件关联附件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -271,6 +270,7 @@
eventResourceDO.setUrl(commonEventAddDTO.getAudio());
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(audioAdd!=1){
throw new ServiceException("添加音频失败");
@@ -284,6 +284,7 @@
eventResourceDO.setUrl(commonEventAddDTO.getVideo());
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(videoAdd!=1){
throw new ServiceException("添加视频失败");
@@ -335,6 +336,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getAudio());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -348,6 +350,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getVideo());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -395,6 +398,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getAudio());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -408,6 +412,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getVideo());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -454,7 +459,7 @@
return R.fail("查询社区错误");
}
ComActVO comActVO= JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
- if(comActVO!=null){
+ if(comActVO==null){
return R.fail("社区不存在");
}
eventDO.setCommunityProcess(1); //社区处理
@@ -539,6 +544,7 @@
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("添加音频失败");
@@ -552,6 +558,7 @@
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("添加视频失败");
@@ -664,6 +671,7 @@
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("添加音频失败");
@@ -677,6 +685,7 @@
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("添加视频失败");
@@ -724,6 +733,7 @@
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("添加音频失败");
@@ -737,6 +747,7 @@
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("添加视频失败");
@@ -790,6 +801,7 @@
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("添加音频失败");
@@ -803,6 +815,7 @@
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("添加视频失败");
@@ -866,6 +879,7 @@
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("添加音频失败");
@@ -879,6 +893,7 @@
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("添加视频失败");
@@ -928,6 +943,7 @@
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("添加音频失败");
@@ -941,6 +957,7 @@
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("添加视频失败");
@@ -988,6 +1005,7 @@
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("添加音频失败");
@@ -1001,6 +1019,7 @@
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("添加视频失败");
--
Gitblit v1.7.1