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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/controller/DMPDataController.java

@@ -74,7 +74,7 @@ public class DMPDataController {
             end = dateRange.getRight();
         }
 
-        // 2. TODO: 实时或DB离线查询GA Daily Report和Enquiries
+        // 2. TODO: 实时或DB离线查询
         List<DailyStatsVO> dailyStatsVOs =
                 realtimeReport
                         ? realtimeReportService.getDailyStats(siteCode, start, end)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/report/GAReportRequestDTO.java

@@ -18,20 +18,20 @@ public class GAReportRequestDTO {
 
     private String endDate;
 
-    /** Use default values in {@link ReportType} instead. */
-    @Deprecated private List<String> metrics;
+    /** Overrides defaults in {@link ReportType}. */
+    private List<String> metrics;
 
-    /** Use default values in {@link ReportType} instead. */
-    @Deprecated private List<String> dimensions;
+    /** Overrides defaults in {@link ReportType}. */
+    private List<String> dimensions;
 
-    /** Use default values in {@link ReportType} instead. */
-    @Deprecated private String orderBy;
+    /** Overrides defaults in {@link ReportType}. */
+    private String orderBy;
 
-    /** Use default values in {@link ReportType} instead. */
-    @Deprecated private OrderByType orderByType;
+    /** Overrides defaults in {@link ReportType}. */
+    private OrderByType orderByType;
 
-    /** Use default values in {@link ReportType} instead. */
-    @Deprecated private Boolean orderByDesc;
+    /** Overrides defaults in {@link ReportType}. */
+    private Boolean orderByDesc;
 
     private int limit;
 }

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

@@ -38,14 +38,14 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 从DataBridge实时拉取GA报表数据，非DB离线查询 - http://data-bridge.v3.adwebcloud.com:9002/swagger-ui/index.html
+ * 从DataBridge实时拉取GA报表数据，替代DB离线查询 - http://data-bridge.v3.adwebcloud.com:9002/swagger-ui/index.html
  *
- * @deprecated 相比XXL定期同步 + DB离线查询机制，响应速度较慢
  * @author wfansh
+ * @deprecated 相比XXL定期同步 + DB离线查询，响应速度稍慢。后期DB数据量大产生性能瓶颈时，可重新评估并启用本方案
  */
 @Deprecated
-@Service
 @Slf4j
+@Service
 public class RealtimeReportService {
 
     @Autowired private IAdwebSiteService adwebSiteService;

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -440,7 +440,7 @@ v3:
   projectPath: D:/Advich/pem
   dmp:
     # DMP模块实时报表开关，true-从DataBridge实时读取 false-从DB离线读取
-    realtimeReport: true
+    realtimeReport: false
 
 ### 建站链接测试环境配置
 AdwebSiteConnect: