From 8a5f74a6cf88a7bd15eb52f5627305e94cbfdbff Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 17 Aug 2022 15:51:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E8=B0=83=E6=95=B4=20=E5=8A=9E=E7=BB=93=E5=92=8C?=
 =?UTF-8?q?=E5=8C=96=E8=A7=A3=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/opendata/entity/EventreportPingyinEntity.java    | 7 ++++++-
 .../service/impl/EventreportPingyinServiceImpl.java        | 6 ++++--
 .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java  | 5 ++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
index 1298790b7c..79c2064f9d 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
@@ -91,10 +91,15 @@ public class EventreportPingyinEntity {
 	private String waysOfResolving;
 
     /**
-     * 是否办结，填写Y、N（Y 是  N 否）
+     * 必填 是否化解，填写Y、N（Y 是  N 否）
      */
 	private String successfulOrNo;
 
+	/**
+	 * 必填 是否办结，填写Y、N（Y 是  N 否）
+	 */
+	private String successfulDefuse;
+
     /**
      * 办结层级，符合《标准》10.21
      */
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
index 380df961e4..0fe4ff1620 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java
@@ -67,7 +67,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
         //分批次循环
         while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()) {
             formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
-            result = dataStatisticalOpenFeignClient.getEventInfo(formDTO);
+            result = dataStatisticalOpenFeignClient.getEventInfoV2(formDTO);
             list = result.getData();
             saveEvent(list, formDTO.getInitFlag());
         }
@@ -122,11 +122,13 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             eventDescription = StrUtil.filterEmoji(eventDescription);
             entity.setEventDescription(eventDescription);
             entity.setWaysOfResolving(item.getWaysOfResolving());
-            //业务不确定
+            //业务不确定  办结状态和化解状态同步修改
             if (("03").equals(item.getStatus())) {
                 entity.setSuccessfulOrNo("Y");
+                entity.setSuccessfulDefuse("Y");
             } else {
                 entity.setSuccessfulOrNo("N");
+                entity.setSuccessfulDefuse("N");
             }
             entity.setCompleteLevel(item.getCompleteLevel());
             entity.setCompleteTime(item.getCompleteTime());
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
index a4e98d714f..01ba8bd7b6 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java
@@ -61,14 +61,13 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
         do {
             Result<List<PatrolRoutineWorkResult>> record = epmetUserOpenFeignClient.getPatrolRoutineWorkListV2(midPatrolFormDTO);
             if (record == null || !record.success()) {
-                log.error("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
+                log.warn("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO));
                 throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());
             }
             data = record.getData();
             if (CollectionUtils.isEmpty(data)) {
                 //数据已被删除了
-                //暂时设置error 用于排错
-                log.error("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
+                log.warn("获取例行工作记录返回为空，param:{}", JSON.toJSONString(midPatrolFormDTO));
                 int effectRow = baseDao.deleteById(patrolRecordForm.getId());
                 log.warn("del effectRow:{}", effectRow);
                 throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());