From f495b3389331dac4f5c66a9383a8a0c7ff82e37d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 28 五月 2021 18:14:15 +0800
Subject: [PATCH] none

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java |  218 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 132 insertions(+), 86 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..694d3a8 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
@@ -129,10 +129,10 @@
 
     /**
      * 删除事件
-     * @param EventDeleteDTO
+     * @param CommonEventDeleteDTO
      * @return 平台用户信息
      */
-    public R delete(EventDeleteDTO EventDeleteDTO){
+    public R delete(CommonEventDeleteDTO CommonEventDeleteDTO){
         return R.fail();
     }
 
@@ -231,57 +231,56 @@
 
     @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);
+        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.setGridMemberId(commonEventAddDTO.getUserId());
+        eventDO.setGridMemberName(commonEventAddDTO.getUserName());
+        eventDO.setGridMemberTelephone(commonEventAddDTO.getPhone());
+        eventDO.setCreateBy(commonEventAddDTO.getUserId());
         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());
                 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());
                 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("添加图片失败");
@@ -294,54 +293,55 @@
     }
 
     @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());
             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());
                     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());
                     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 +353,56 @@
             return R.fail();
         }else{
             //编辑原来的
-            EventDO eventDO = eventMapper.selectById(emergenciesEventEditDTO.getId());
-            BeanUtils.copyProperties(emergenciesEventEditDTO, eventDO);
-            eventDO.setGridMemberId(emergenciesEventEditDTO.getUserId());
+            EventDO eventDO = eventMapper.selectById(commonEventEditDTO.getId());
+            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());
             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());
                     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());
                     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 +417,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,20 +428,20 @@
         if(eventDO.getProcessType()==2){
             return R.fail("当前事件已交由社区处理");
         }
-        eventDO.setCommunityProcess(1);
-        eventDO.setProcessType(2);
-        eventDO.setEventProcessStatus(1);
-        eventDO.setUpdateBy(emergenciesEventReportDTO.getUserId());
+        eventDO.setCommunityProcess(1);    //社区处理
+        eventDO.setProcessType(2);    //当前处理对象: 社区处理
+        eventDO.setEventProcessStatus(1);    //待处理
+        eventDO.setUpdateBy(commonEventReportDTO.getUserId());
         int updated = this.getBaseMapper().updateById(eventDO);
         if(updated!=1){
             throw new ServiceException("更新突发事件状态更新失败");
         }
         EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
-        BeanUtils.copyProperties(emergenciesEventReportDTO, eventTransferRecordDO);
+        BeanUtils.copyProperties(commonEventReportDTO, eventTransferRecordDO);
         eventTransferRecordDO.setFromType(1);
-        eventTransferRecordDO.setFromId(emergenciesEventReportDTO.getUserId());
-        eventTransferRecordDO.setFromName(emergenciesEventReportDTO.getUserName());
-        eventTransferRecordDO.setToType(2);
+        eventTransferRecordDO.setFromId(commonEventReportDTO.getUserId());
+        eventTransferRecordDO.setFromName(commonEventReportDTO.getUserName());
+        eventTransferRecordDO.setToType(2);//转交类型:2、社区
         eventTransferRecordDO.setProcessDate(new Date());
         int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
         return inserted==1?R.ok():R.fail();
@@ -453,20 +453,25 @@
         if(eventDO==null){
             return R.fail("事件不存在");
         }
-        boolean canRevoke = eventDO.getEventStatus()==2 && eventDO.getCommunityProcess()==0;
+        boolean canRevoke = eventDO.getEventStatus()==2 //发布状态
+                && eventDO.getEventProcessStatus()==1   //待处理
+                ;
         if(!canRevoke){
             return R.fail("当前事件不允许撤销");
         }
         eventDO.setEventStatus(4);
         eventDO.setUpdateBy(eventRevokeDTO.getUserId());
+        eventDO.setEventType(5);//突发事件分类
+        eventDO.setProcessType(1);//网格员处理
+        eventDO.setCommunityProcess(0);//非 社区处理
         int updated = this.getBaseMapper().updateById(eventDO);
         return updated==1?R.ok():R.fail();
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R dealEvent(EventDealDTO eventDealDTO) {
-        EventDO eventDO = this.getBaseMapper().selectById(eventDealDTO.getId());
+    public R dealEvent(CommonEventDealDTO commonEventDealDTO) {
+        EventDO eventDO = this.getBaseMapper().selectById(commonEventDealDTO.getId());
         boolean canDealByUser = eventDO.getEventStatus()==2 && eventDO.getEventProcessStatus()==1;
         if(!canDealByUser){
             if(eventDO.getEventStatus()!=2){
@@ -479,59 +484,66 @@
         }
 
         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);
+        BeanUtils.copyProperties(commonEventDealDTO, eventTransferRecordDO);
         eventTransferRecordDO.setFromType(1);
-        eventTransferRecordDO.setFromId(eventDealDTO.getUserId());
-        eventTransferRecordDO.setFromName(eventDealDTO.getUserName());
+        eventTransferRecordDO.setFromId(commonEventDealDTO.getUserId());
+        eventTransferRecordDO.setFromName(commonEventDealDTO.getUserName());
         eventTransferRecordDO.setToType(1);
-        eventTransferRecordDO.setToId(eventDealDTO.getUserId());
+        eventTransferRecordDO.setToId(commonEventDealDTO.getUserId());
         eventTransferRecordDO.setProcessDate(new Date());
         eventTransferRecordDO.setEventId(eventDO.getId());
         int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
         if(inserted==1){
             //添加音频
-            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.setUrl(commonEventDealDTO.getAudio());
                 eventResourceDO.setRefId(eventTransferRecordDO.getId());
-                eventResourceDO.setCreateBy(eventDealDTO.getUserId());
+                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                 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.setUrl(commonEventDealDTO.getVideo());
                 eventResourceDO.setRefId(eventTransferRecordDO.getId());
-                eventResourceDO.setCreateBy(eventDealDTO.getUserId());
+                eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
                 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.setCreateBy(commonEventDealDTO.getUserId());
                     int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                     if(picAdd!=1){
                         throw new ServiceException("添加图片失败");
@@ -545,8 +557,8 @@
     }
 
     @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,19 +569,19 @@
         }
 
         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.setFromId(commonEventVerifyDTO.getUserId());
+        eventTransferRecordDO.setFromName(commonEventVerifyDTO.getUserName());
         eventTransferRecordDO.setToType(1);
-        eventTransferRecordDO.setToId(eventVerifyDTO.getUserId());
+        eventTransferRecordDO.setToId(commonEventVerifyDTO.getUserId());
         eventTransferRecordDO.setProcessDate(new Date());
-        eventTransferRecordDO.setToName(eventVerifyDTO.getUserName());
+        eventTransferRecordDO.setToName(commonEventVerifyDTO.getUserName());
         eventTransferRecordDO.setEventId(eventDO.getId());
         int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
         if(inserted==1){
@@ -580,25 +592,59 @@
     }
 
     @Override
-    public R republishEvent(EventRepublicDTO eventRepublicDTO) {
-        EventDO eventDO = this.getBaseMapper().selectById(eventRepublicDTO.getId());
+    public R republishEvent(CommonEventRepublicDTO commonEventRepublicDTO) {
+        EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublicDTO.getId());
         boolean canRepublishByUser = eventDO.getEventStatus()==4;
         if(!canRepublishByUser){
             return R.fail("当前不是撤销状态");
         }
 
         eventDO.setEventStatus(2);//2已解决
-        eventDO.setUpdateBy(eventRepublicDTO.getUserId());
+        eventDO.setUpdateBy(commonEventRepublicDTO.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.setFromId(commonEventRepublicDTO.getUserId());
+        eventTransferRecordDO.setFromName(commonEventRepublicDTO.getUserName());
         eventTransferRecordDO.setToType(1);
-        eventTransferRecordDO.setToId(eventRepublicDTO.getUserId());
+        eventTransferRecordDO.setToId(commonEventRepublicDTO.getUserId());
+        eventTransferRecordDO.setProcessDate(new Date());
+        eventTransferRecordDO.setEventId(eventDO.getId());
+        int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);
+        if(inserted==1){
+            return R.ok();
+        }else{
+            throw new ServiceException("事件处理添加出错");
+        }
+    }
+
+    @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("更新事件状态失败");
+        }
+        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
+        eventTransferRecordDO.setFromType(1);//来源类型 1、网格员
+        eventTransferRecordDO.setFromId(commonEventPublicDTO.getUserId());
+        eventTransferRecordDO.setFromName(commonEventPublicDTO.getUserName());
+        eventTransferRecordDO.setToType(1);//转交类型 1、网格员
+        eventTransferRecordDO.setToId(commonEventPublicDTO.getUserId());
         eventTransferRecordDO.setProcessDate(new Date());
         eventTransferRecordDO.setEventId(eventDO.getId());
         int inserted = eventTransferRecordService.getBaseMapper().insert(eventTransferRecordDO);

--
Gitblit v1.7.1