Merge branch 'cpq-dev' of wangfan/adweb3-server into master

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

@@ -52,7 +52,7 @@ public class GTMController {
         adwebSite.setGtmHead(snippets.getKey());
         adwebSite.setGtmBody(snippets.getValue());
         adwebSiteService.updateById(adwebSite);
-        
+
         return Result.ok(adwebSite);
     }
 
@@ -61,14 +61,19 @@ public class GTMController {
     public Result<AdwebSite> getGtmContent(Integer id) {
         Result<AdwebSite> result = new Result<AdwebSite>();
         AdwebSite adwebSite = adwebSiteService.getById(id);
-        if (adwebSite != null) {
-            result.setResult(adwebSite);
-            result.setCode(200);
-            result.setMessage("ok");
-        } else {
-            result.setCode(100);
-            result.setMessage("fail");
-        }
+
+        // 如果GoogleGTM表中已存在，不再创建，返回现有记录
+        GoogleGTM googleGTM =
+                gtmAdminService.createContainer(
+                        adwebSite.getCode(), adwebSite.getDomain(), adwebSite.getName());
+
+        Pair<String, String> snippets = gtmAdminService.getSnippets(googleGTM.getGtmTagId());
+        adwebSite.setGtmHead(snippets.getKey());
+        adwebSite.setGtmBody(snippets.getValue());
+        
+        result.setResult(adwebSite);
+        result.setCode(200);
+        result.setMessage("ok");
         return result;
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/entity/AdwebSite.java

@@ -138,20 +138,6 @@ public class AdwebSite implements Serializable {
     private java.util.Date etime;
 
     /**
-     * Google GTM Head埋点代码
-     */
-    @Excel(name = "Google GTM Head埋点代码", width = 15)
-    @Schema(description = "Google GTM Head埋点代码")
-    private String gtmHead;
-
-    /**
-     * Google GTM Body埋点代码
-     */
-    @Excel(name = "Google GTM Body埋点代码", width = 15)
-    @Schema(description = "Google GTM Body埋点代码")
-    private String gtmBody;
-
-    /**
      * 站点停止时间
      */
     @Excel(name = "站点停止时间", width = 15, format = "yyyy-MM-dd")
@@ -385,4 +371,16 @@ public class AdwebSite implements Serializable {
      */
     @TableField(exist = false)
     private JSONObject subscribePlan;
+
+    /**
+     * Google GTM Head埋点代码
+     */
+    @TableField(exist = false)
+    private String gtmHead;
+
+    /**
+     * Google GTM Body埋点代码
+     */
+    @TableField(exist = false)
+    private String gtmBody;
 }