From 512b01a869d81480ba2ec0845be038146a3457a4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 May 2023 09:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96submitXxxdEventToItem?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=94=9F=E4=BA=A7=E6=89=8D=E4=BC=9A=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=88=B0=E5=B8=82=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/XxxdEventServiceImpl.java    | 13 +++-
 .../item/service/impl/ItemServiceImpl.java    | 71 ++++++++++++-------
 2 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java
index bbe50592a..d6602400d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/XxxdEventServiceImpl.java
@@ -74,12 +74,23 @@ public class XxxdEventServiceImpl extends BaseServiceImpl<XxxdEventDao, XxxdEven
                 .eq(XxxdEventEntity::getDelFlag, NumConstant.ZERO_STR);
         XxxdEventEntity origin=baseDao.selectOne(queryWrapper);
         if (null == origin) {
+            // 0已接收；1已转北上速办事件；2已完结
             entity.setInternalStatus(NumConstant.ZERO_STR);
             insert(entity);
         } else {
             entity.setId(origin.getId());
             updateById(entity);
         }
+        // 优化下这个方法
+        submitXxxdEventToItem(entity);
+        return entity.getId();
+    }
+
+    /**
+     * 新新向党随手拍事件，组装数据，插入民生诉求epdc_item表
+     * @param entity
+     */
+    private void submitXxxdEventToItem(XxxdEventEntity entity) {
         //同步到北上速办-民生诉求
         SubmitItemFormDTO submitItemFormDTO=new SubmitItemFormDTO();
         submitItemFormDTO.setNickName(entity.getName());
@@ -106,8 +117,8 @@ public class XxxdEventServiceImpl extends BaseServiceImpl<XxxdEventDao, XxxdEven
                 submitItemFormDTO.setItemVoice(audioList.get(NumConstant.ZERO));
             }
         }
+        //这个方法内部，会更新xxxd_event，记录是否成功
         SpringContextUtils.getBean(ItemServiceImpl.class).submitXxxdEventToItem(entity.getId(), entity.getLongitude(), entity.getLatitude(), submitItemFormDTO);
-        return entity.getId();
     }
 
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index ed1d21d38..0ca8bfc1b 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -111,6 +111,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -3519,29 +3520,35 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
             sendItemToDsf(dto, itemHandleProcessEntity);
         }
-        //发送到市平台
-        /*try {
-            if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
-                //民生
-                sendCaseLivelihood(entity);
-            } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
-                //发展
-                sendCaseDevelop(entity);
-            }
-        } catch (Exception e) {
-            StringBuffer str = new StringBuffer();
-            switch (formDto.getPeopleFlag()) {
-                case NumConstant.ZERO_STR:
-                    str.append("民生");
-                    break;
-                case NumConstant.ONE_STR:
-                    str.append("发展");
-                    break;
+        // ！！！！！！！只有生产推送市平台
+        Environment environment = SpringContextUtils.getBean(Environment.class);
+        String[] activeProfiles = environment.getActiveProfiles();
+        if (activeProfiles.length > 0 && "prod".equals(activeProfiles[0])) {
+            log.info("当前运行环境：" + activeProfiles[0]);
+            // 发送到市平台
+            try {
+                if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
+                    // 民生
+                    sendCaseLivelihood(entity);
+                } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
+                    // 发展
+                    sendCaseDevelop(entity);
+                }
+            } catch (Exception e) {
+                StringBuffer str = new StringBuffer();
+                switch (formDto.getPeopleFlag()) {
+                    case NumConstant.ZERO_STR:
+                        str.append("民生");
+                        break;
+                    case NumConstant.ONE_STR:
+                        str.append("发展");
+                        break;
+                }
+                str.append("诉求上报，发送事件数据到市中心错误，诉求项目Id->").append(entity.getId());
+                log.error(str.toString());
+                e.printStackTrace();
             }
-            str.append("诉求上报，发送事件数据到市中心错误，诉求项目Id->").append(entity.getId());
-            log.error(str.toString());
-            e.printStackTrace();
-        }*/
+        }
         return entity.getId();
     }
 
@@ -5565,7 +5572,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             Result<GisGridDTO> gisGridRes = adminFeignClient.getGridByCoordinate(gisFormDTO);
             if (!gisGridRes.success() || null == gisGridRes.getData()) {
                 internalRemark = "根据经纬度获取网格信息失败:" + gisGridRes.getMsg();
-                // return;
+                log.error("submitXxxdEventToItem上传到民生诉求异常:"+internalRemark);
+                // return;// 测试时候注释掉，让它继续执行
             }else{
                 gridId = String.valueOf(gisGridRes.getData().getGridId());
                 gridName = gisGridRes.getData().getGridName();
@@ -5576,11 +5584,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 submitItemFormDTO.setGridId(gisGridRes.getData().getGridId());
                 submitItemFormDTO.setGrid(gisGridRes.getData().getGridName());
             }
-            submitItemFormDTO.setGridId(1001L);
-            submitItemFormDTO.setGrid("test");
-
+            // dev开发环境临时赋值
+            Environment environment = SpringContextUtils.getBean(Environment.class);
+            String[] activeProfiles = environment.getActiveProfiles();
+            if (activeProfiles.length > 0 && "dev".equals(activeProfiles[0])) {
+                log.info("当前运行环境：" + activeProfiles[0]);
+                submitItemFormDTO.setGridId(1001L);
+                submitItemFormDTO.setGrid("test");
+            }
+            // 复制了一个民生诉求提交方法submitMsFzItemResi =》submitMsFzItemResiForXxxd
             bssbEventId = this.submitMsFzItemResiForXxxd(submitItemFormDTO);
 
+            if(StringUtils.isNotBlank(bssbEventId)){
+                //成功返回epdc_item.id，说明提交民生诉求成功，状态改为1
+                internalStatus=NumConstant.ONE_STR;
+                log.info("submitXxxdEventToItem上传到民生诉求成功：bssbEventId："+bssbEventId);
+            }
         } catch (Exception e) {
             internalRemark="上传到民生诉求异常";
             log.error("submitXxxdEventToItem上传到民生诉求异常",e);