Merge branch 'master' into pingyin_master

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -252,6 +252,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>

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java

@@ -70,20 +70,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);
         }
 
 
@@ -214,7 +206,9 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 }
             }
         }
-
+        //将同步的数据保存
-
+        SavePyEventDataFormDTO savePyEventData = new SavePyEventDataFormDTO();
+        savePyEventData.setProjectList(ConvertUtils.sourceToTarget(entityList, EventreportPingyinDTO.class));
+        dataStatisticalOpenFeignClient.saveData(savePyEventData);
     }
 }