From 9a343b4ccd3e23872bff531573625784627dd4ab Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 15 Dec 2022 18:05:20 +0800
Subject: [PATCH 1/2] pom

---
 epmet-module/data-aggregator/data-aggregator-server/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 56f4b3ffe9..333a287b4c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -245,6 +245,12 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
+                <datasource.druid.evaluationIndex1.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.evaluationIndex1.url>
+                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
+                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
+
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>

From 43dfdb56b57d00e5aa8a62b44ceb0052135b4919 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 16 Dec 2022 09:39:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EventreportPingyinServiceImpl.java        | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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 26ad53ed28..3acc500e59 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,20 +67,12 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
         }
         List<EventInfoResultDTO> list = result.getData();
         saveEvent(list, formDTO.getInitFlag());
-        //将同步的数据保存
-        SavePyEventDataFormDTO savePyEventData = new SavePyEventDataFormDTO();
-        savePyEventData.setProjectList(ConvertUtils.sourceToTarget(list, EventreportPingyinDTO.class));
-        dataStatisticalOpenFeignClient.saveData(savePyEventData);
         //分批次循环
         while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()) {
             formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
             result = dataStatisticalOpenFeignClient.getEventInfoV2(formDTO);
             list = result.getData();
             saveEvent(list, formDTO.getInitFlag());
-            //将同步的数据保存
-            savePyEventData = new SavePyEventDataFormDTO();
-            savePyEventData.setProjectList(ConvertUtils.sourceToTarget(list, EventreportPingyinDTO.class));
-            dataStatisticalOpenFeignClient.saveData(savePyEventData);
         }
 
 
@@ -211,7 +203,9 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 }
             }
         }
-
-
+        //将同步的数据保存
+        SavePyEventDataFormDTO savePyEventData = new SavePyEventDataFormDTO();
+        savePyEventData.setProjectList(ConvertUtils.sourceToTarget(entityList, EventreportPingyinDTO.class));
+        dataStatisticalOpenFeignClient.saveData(savePyEventData);
     }
 }