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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/OpenAPIRequest.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.adweb.dmp.dto;
 import lombok.Data;
 
 /**
+ * Open API request for http://data-bridge.v3.adwebcloud.com:9002/swagger-ui/index.html
+ *
  * @author wfansh
  */
 @Data

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/OpenAPIResponse.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.adweb.dmp.dto;
 import lombok.Data;
 
 /**
+ * Open API response for http://data-bridge.v3.adwebcloud.com:9002/swagger-ui/index.html
+ *
  * @author wfansh
  */
 @Data

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/mapper/xml/GoogleGTMMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.dmp.mapper.GoogleGTMMapper">
+<mapper namespace="org.jeecg.modules.adweb.dmp.mapper.GoogleGTMMapper">
 
 </mapper>

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

@@ -29,9 +29,7 @@ import java.util.List;
 @Service
 public class GAReportService {
 
-    private static final String DATA_BRIDGE_GA_REPORT_PATH = "/api/google/ga/report";
-
-    private RestTemplate restTemplate;
+    private static final String GA_REPORT_API_PATH = "/api/google/ga/report";
 
     @Value("${data-bridge.api.host}")
     private String dataBridgeApiHost;
@@ -39,9 +37,11 @@ public class GAReportService {
     @Value("${data-bridge.api.token}")
     private String dataBridgeApiToken;
 
+    private RestTemplate restTemplate;
+
     @PostConstruct
     private void init() {
-        this.restTemplate = RestTemplateUtil.getRestTemplate(30, 30, dataBridgeApiToken);
+        this.restTemplate = RestTemplateUtil.getRestTemplate(60, 60, dataBridgeApiToken);
     }
 
     //    /**
@@ -63,7 +63,7 @@ public class GAReportService {
     @VisibleForTesting
     <T extends GAReportDataDTO> List<T> runGAReport(
             GAReportRequestDTO gaReportRequest, Class<T> reportDataType) {
-        log.info("runGAReport: {}", FastJsonUtil.toJSONString(gaReportRequest));
+        log.info("runGAReport: report request = {}", FastJsonUtil.toJSONString(gaReportRequest));
 
         // 1. 创建API request
         OpenAPIRequest<GAReportRequestDTO> openAPIRequest = new OpenAPIRequest<>();
@@ -75,13 +75,17 @@ public class GAReportService {
         OpenAPIResponse<List<T>> openAPIResponse =
                 RestTemplateUtil.postForObject(
                         restTemplate,
-                        dataBridgeApiHost + DATA_BRIDGE_GA_REPORT_PATH,
+                        dataBridgeApiHost + GA_REPORT_API_PATH,
                         openAPIRequest,
                         ParameterizedTypeReference.forType(
                                 TypeUtils.parameterize(
                                         OpenAPIResponse.class,
                                         TypeUtils.parameterize(List.class, reportDataType))));
 
+        // 3. 日志并返回
+        log.info(
+                "runGAReport: report response = {}",
+                FastJsonUtil.toJSONString(openAPIResponse.getData()));
         return openAPIResponse.getData();
     }
 }