Merge branch 'lambda' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/google/GAReportService.java

@@ -178,7 +178,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GADailyReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaDailyReportService.saveBatch(dailyReport, dailyReport.size());
+        if (CollectionUtils.isNotEmpty(dailyReport)) {
+            gaDailyReportService.saveBatch(dailyReport, dailyReport.size());
+        } else {
+            log.info("syncGADailyReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -228,7 +232,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GACountryReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaCountryReportService.saveBatch(countryReport, countryReport.size());
+        if (CollectionUtils.isNotEmpty(countryReport)) {
+            gaCountryReportService.saveBatch(countryReport, countryReport.size());
+        } else {
+            log.info("syncGACountryReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -298,7 +306,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GASourceMediumReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaSourceMediumReportService.saveBatch(sourceMediumReport, sourceMediumReport.size());
+        if (CollectionUtils.isNotEmpty(sourceMediumReport)) {
+            gaSourceMediumReportService.saveBatch(sourceMediumReport, sourceMediumReport.size());
+        } else {
+            log.info("syncGASourceMediumReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -358,7 +370,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GAPagePathReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaPagePathReportService.saveBatch(pagePathReport, pagePathReport.size());
+        if (CollectionUtils.isNotEmpty(pagePathReport)) {
+            gaPagePathReportService.saveBatch(pagePathReport, pagePathReport.size());
+        } else {
+            log.info("syncGAPagePathReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -427,7 +443,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GADeviceReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaDeviceReportService.saveBatch(deviceReport, deviceReport.size());
+        if (CollectionUtils.isNotEmpty(deviceReport)) {
+            gaDeviceReportService.saveBatch(deviceReport, deviceReport.size());
+        } else {
+            log.info("syncGADeviceReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**