pudongliang 3 месяцев назад
Родитель
Сommit
2b13156842
35 измененных файлов с 25 добавлено и 25 удалено
  1. 1 1
      portal/dist/assets/accountGroup-TVsegDod.js
  2. 1 1
      portal/dist/assets/adAutoConf--MrHVNQZ.js
  3. 1 1
      portal/dist/assets/adPlanConf-xeIB6Mb8.js
  4. 1 1
      portal/dist/assets/auth-BVPI9m4Z.js
  5. 1 1
      portal/dist/assets/conversion-DB_-ZZb-.js
  6. 0 0
      portal/dist/assets/detail-CL5T6rLz.js
  7. 1 1
      portal/dist/assets/drama-DsPylfxR.js
  8. 0 0
      portal/dist/assets/edit-DEpNy4kJ.js
  9. 1 1
      portal/dist/assets/index-B9XIvkCG.js
  10. 0 0
      portal/dist/assets/index-BUObomee.js
  11. 0 0
      portal/dist/assets/index-BehsA2LU.js
  12. 0 0
      portal/dist/assets/index-BtaGGCkq.js
  13. 0 0
      portal/dist/assets/index-Btb2OOBe.js
  14. 0 0
      portal/dist/assets/index-CL9HvIs5.js
  15. 0 0
      portal/dist/assets/index-CVkb0gEN.js
  16. 0 0
      portal/dist/assets/index-CX_7odaH.js
  17. 0 0
      portal/dist/assets/index-CxvlrxYO.js
  18. 0 0
      portal/dist/assets/index-D1XLWpAh.js
  19. 0 0
      portal/dist/assets/index-D62T328S.js
  20. 0 0
      portal/dist/assets/index-DNX6Zd6A.js
  21. 0 0
      portal/dist/assets/index-DWBfSxM3.js
  22. 0 0
      portal/dist/assets/index-DdZiQ8vH.js
  23. 0 0
      portal/dist/assets/index-DjTyDjcM.js
  24. 0 0
      portal/dist/assets/index-DtrhPP7X.js
  25. 0 0
      portal/dist/assets/index-iu3X8KZ6.js
  26. 0 0
      portal/dist/assets/index-kq64Ih_E.js
  27. 0 0
      portal/dist/assets/index-tQgGmclq.js
  28. 1 1
      portal/dist/assets/loadPageConf-JELGdAKK.js
  29. 1 1
      portal/dist/assets/ossFile-0jH69E28.js
  30. 0 0
      portal/dist/assets/request-B37nuy4Q.js
  31. 1 1
      portal/dist/assets/user-D0nb7Crc.js
  32. 1 1
      portal/dist/index.html
  33. 2 2
      portal/src/views/daily-creative-report/index.vue
  34. 6 6
      src/main/resources/mapper/RepDailyCreativeReportMapper.xml
  35. 6 6
      src/main/resources/mapper/ReqDailyCreativeReportMapper.xml

+ 1 - 1
portal/dist/assets/accountGroup-L0Acv6sZ.js → portal/dist/assets/accountGroup-TVsegDod.js

@@ -1 +1 @@
-import{r as u}from"./request-BEyjwjiN.js";function c(t){return u({url:"/api/account-group/create",method:"post",data:t})}function e(t){return u({url:"/api/account-group/update",method:"post",data:t})}function n(t){return u({url:`/api/account-group/${t}`,method:"delete"})}function a(t=1,o=10){return u({url:"/api/account-group/list",method:"get",params:{pageNum:t,pageSize:o}})}function p(){return u({url:"/api/account-group/all",method:"get"})}function i(t){return u({url:`/api/account-group/${t}/accounts`,method:"get"})}export{i as a,p as b,c,n as d,a as g,e as u};
+import{r as u}from"./request-B37nuy4Q.js";function c(t){return u({url:"/api/account-group/create",method:"post",data:t})}function e(t){return u({url:"/api/account-group/update",method:"post",data:t})}function n(t){return u({url:`/api/account-group/${t}`,method:"delete"})}function a(t=1,o=10){return u({url:"/api/account-group/list",method:"get",params:{pageNum:t,pageSize:o}})}function p(){return u({url:"/api/account-group/all",method:"get"})}function i(t){return u({url:`/api/account-group/${t}/accounts`,method:"get"})}export{i as a,p as b,c,n as d,a as g,e as u};

+ 1 - 1
portal/dist/assets/adAutoConf-B7ClHUhQ.js → portal/dist/assets/adAutoConf--MrHVNQZ.js

@@ -1 +1 @@
-import{r as e}from"./request-BEyjwjiN.js";function u(t){return e({url:"/api/ad-auto-conf/list",method:"get",params:t})}function n(t){return e({url:`/api/ad-auto-conf/${t}`,method:"get"})}function a(t){return e({url:"/api/ad-auto-conf",method:"post",data:t})}function r(t){return e({url:"/api/ad-auto-conf/update",method:"post",data:t})}function d(t){return e({url:`/api/ad-auto-conf/${t}`,method:"delete"})}function i(t){return e({url:`/api/ad-auto-conf/execute?id=${t}`,method:"post"})}function f(t){return e({url:"/api/execute-log/list",method:"get",params:t})}function c(t){return e({url:"/api/execute-log/getChildLog",method:"get",params:t})}export{c as a,f as b,n as c,d,i as e,u as g,a as s,r as u};
+import{r as e}from"./request-B37nuy4Q.js";function u(t){return e({url:"/api/ad-auto-conf/list",method:"get",params:t})}function n(t){return e({url:`/api/ad-auto-conf/${t}`,method:"get"})}function a(t){return e({url:"/api/ad-auto-conf",method:"post",data:t})}function r(t){return e({url:"/api/ad-auto-conf/update",method:"post",data:t})}function d(t){return e({url:`/api/ad-auto-conf/${t}`,method:"delete"})}function i(t){return e({url:`/api/ad-auto-conf/execute?id=${t}`,method:"post"})}function f(t){return e({url:"/api/execute-log/list",method:"get",params:t})}function c(t){return e({url:"/api/execute-log/getChildLog",method:"get",params:t})}export{c as a,f as b,n as c,d,i as e,u as g,a as s,r as u};

+ 1 - 1
portal/dist/assets/adPlanConf-C1uOKbih.js → portal/dist/assets/adPlanConf-xeIB6Mb8.js

@@ -1 +1 @@
-import{r as a}from"./request-BEyjwjiN.js";function d(n){return a({url:"/api/ad-plan-conf/reCreate",method:"post",data:n})}function o(n){return a({url:"/api/ad-plan-conf/generate-plan",method:"post",data:n})}function u(n){return a({url:`/api/ad-plan-conf/reGeneratePlan/${n}`,method:"get"})}function l(n){return a({url:`/api/ad-plan-conf/syncSystemStatus/${n}`,method:"get"})}function p(n){return a({url:"/api/ad-plan-conf/create",method:"post",data:n})}function s(n){return a({url:"/api/ad-plan-conf/update",method:"post",data:n})}function i(n=1,e=10,t={}){return a({url:"/api/ad-plan-conf/list",method:"get",params:{pageNum:n,pageSize:e,...t}})}function f(n){return a({url:`/api/ad-plan-conf/${n}`,method:"get"})}function c(n){return a({url:"/api/ad-plan/list",method:"get",params:n})}function g(n){return a({url:`/api/ad-plan-creative/plan/${n}`,method:"get"})}function m(n){return a({url:"/api/ad-plan-conf/gdtSuspendByConfId",params:{confId:n},method:"get"})}function h(n){return a({url:"/api/ad-plan-conf/gdtDeleteByConfId",params:{confId:n},method:"get"})}function C(n,e){return a({url:`/api/ad-plan-conf/gdtSuspendByPlanIds/${n}`,method:"post",data:e})}function P(n,e){return a({url:`/api/ad-plan-conf/gdtDeleteByPlanIds/${n}`,method:"post",data:e})}function y(n=[]){return a({url:"/api/ad-plan-conf/getOneCreativeImage",method:"post",data:n})}function I(){return a({url:"/api/ad-plan-conf/getOneBrandImage",method:"get"})}function B(n=[]){return a({url:"/api/ad-plan-conf/getOneCreativeVideo",method:"post",data:n})}export{y as a,I as b,B as c,o as d,p as e,f,i as g,c as h,h as i,C as j,P as k,l,u as m,g as n,d as r,m as s,s as u};
+import{r as a}from"./request-B37nuy4Q.js";function d(n){return a({url:"/api/ad-plan-conf/reCreate",method:"post",data:n})}function o(n){return a({url:"/api/ad-plan-conf/generate-plan",method:"post",data:n})}function u(n){return a({url:`/api/ad-plan-conf/reGeneratePlan/${n}`,method:"get"})}function l(n){return a({url:`/api/ad-plan-conf/syncSystemStatus/${n}`,method:"get"})}function p(n){return a({url:"/api/ad-plan-conf/create",method:"post",data:n})}function s(n){return a({url:"/api/ad-plan-conf/update",method:"post",data:n})}function i(n=1,e=10,t={}){return a({url:"/api/ad-plan-conf/list",method:"get",params:{pageNum:n,pageSize:e,...t}})}function f(n){return a({url:`/api/ad-plan-conf/${n}`,method:"get"})}function c(n){return a({url:"/api/ad-plan/list",method:"get",params:n})}function g(n){return a({url:`/api/ad-plan-creative/plan/${n}`,method:"get"})}function m(n){return a({url:"/api/ad-plan-conf/gdtSuspendByConfId",params:{confId:n},method:"get"})}function h(n){return a({url:"/api/ad-plan-conf/gdtDeleteByConfId",params:{confId:n},method:"get"})}function C(n,e){return a({url:`/api/ad-plan-conf/gdtSuspendByPlanIds/${n}`,method:"post",data:e})}function P(n,e){return a({url:`/api/ad-plan-conf/gdtDeleteByPlanIds/${n}`,method:"post",data:e})}function y(n=[]){return a({url:"/api/ad-plan-conf/getOneCreativeImage",method:"post",data:n})}function I(){return a({url:"/api/ad-plan-conf/getOneBrandImage",method:"get"})}function B(n=[]){return a({url:"/api/ad-plan-conf/getOneCreativeVideo",method:"post",data:n})}export{y as a,I as b,B as c,o as d,p as e,f,i as g,c as h,h as i,C as j,P as k,l,u as m,g as n,d as r,m as s,s as u};

+ 1 - 1
portal/dist/assets/auth-DJmOHb2J.js → portal/dist/assets/auth-BVPI9m4Z.js

@@ -1 +1 @@
-import{r as t}from"./request-BEyjwjiN.js";function i(){return t({url:"/api/gdt/auth/authorize-url",method:"get"})}function n(r){return t({url:"/api/gdt/auth/refresh",method:"post",params:r})}function u(){return t({url:"/api/gdt/auth/list",method:"get"})}function a(){return u()}function o(){return t({url:"/api/gdt/auth/expiring",method:"get"})}export{o as a,a as b,i as g,u as l,n as r};
+import{r as t}from"./request-B37nuy4Q.js";function i(){return t({url:"/api/gdt/auth/authorize-url",method:"get"})}function n(r){return t({url:"/api/gdt/auth/refresh",method:"post",params:r})}function u(){return t({url:"/api/gdt/auth/list",method:"get"})}function a(){return u()}function o(){return t({url:"/api/gdt/auth/expiring",method:"get"})}export{o as a,a as b,i as g,u as l,n as r};

+ 1 - 1
portal/dist/assets/conversion-DjTr2xoZ.js → portal/dist/assets/conversion-DB_-ZZb-.js

@@ -1 +1 @@
-import{r as t}from"./request-BEyjwjiN.js";function e(n,o){return t({url:"/api/gdt/conversion/sync",method:"post",params:{orgAccountId:n,accountId:o}})}function s(n=1,o=20){return t({url:"/api/gdt/conversion/list",method:"get",params:{page:n,pageSize:o}})}function i(n){return t({url:"/api/gdt/conversion/detail",method:"get",params:{conversionId:n}})}function a(){return t({url:"/api/gdt/conversion/all",method:"get"})}export{s as a,i as b,a as g,e as s};
+import{r as t}from"./request-B37nuy4Q.js";function e(n,o){return t({url:"/api/gdt/conversion/sync",method:"post",params:{orgAccountId:n,accountId:o}})}function s(n=1,o=20){return t({url:"/api/gdt/conversion/list",method:"get",params:{page:n,pageSize:o}})}function i(n){return t({url:"/api/gdt/conversion/detail",method:"get",params:{conversionId:n}})}function a(){return t({url:"/api/gdt/conversion/all",method:"get"})}export{s as a,i as b,a as g,e as s};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/detail-CL5T6rLz.js


+ 1 - 1
portal/dist/assets/drama-By2ij3DG.js → portal/dist/assets/drama-DsPylfxR.js

@@ -1 +1 @@
-import{r as t}from"./request-BEyjwjiN.js";function n(a){return t({url:"/api/gdt/asset/drama/sync",method:"post",params:{accountId:a}})}function m(a=1,s=20,r=""){return t({url:"/api/gdt/asset/drama/list",method:"get",params:{dramaName:r,page:a,pageSize:s}})}function d(a){return t({url:"/api/gdt/asset/drama/myDramaAssets",method:"get",params:{dramaName:a}})}function o(){return t({url:"/api/gdt/asset/drama/sync/conf/myConf",method:"get"})}function u(a){return t({url:"/api/gdt/asset/drama/sync/conf/add",method:"post",data:a})}function i(a){return t({url:"/api/gdt/asset/drama/sync/conf/delete",method:"post",params:{id:a}})}export{o as a,u as b,i as d,m as g,d as m,n as s};
+import{r as t}from"./request-B37nuy4Q.js";function n(a){return t({url:"/api/gdt/asset/drama/sync",method:"post",params:{accountId:a}})}function m(a=1,s=20,r=""){return t({url:"/api/gdt/asset/drama/list",method:"get",params:{dramaName:r,page:a,pageSize:s}})}function d(a){return t({url:"/api/gdt/asset/drama/myDramaAssets",method:"get",params:{dramaName:a}})}function o(){return t({url:"/api/gdt/asset/drama/sync/conf/myConf",method:"get"})}function u(a){return t({url:"/api/gdt/asset/drama/sync/conf/add",method:"post",data:a})}function i(a){return t({url:"/api/gdt/asset/drama/sync/conf/delete",method:"post",params:{id:a}})}export{o as a,u as b,i as d,m as g,d as m,n as s};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/edit-DEpNy4kJ.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
portal/dist/assets/index-B9XIvkCG.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-BUObomee.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-BehsA2LU.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-BtaGGCkq.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-Btb2OOBe.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-CL9HvIs5.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-CVkb0gEN.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-CX_7odaH.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-CxvlrxYO.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-D1XLWpAh.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-D62T328S.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-DNX6Zd6A.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-DWBfSxM3.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-DdZiQ8vH.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-DjTyDjcM.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-DtrhPP7X.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-iu3X8KZ6.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-kq64Ih_E.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/index-tQgGmclq.js


+ 1 - 1
portal/dist/assets/loadPageConf-DAUJy8wI.js → portal/dist/assets/loadPageConf-JELGdAKK.js

@@ -1 +1 @@
-import{r as o}from"./request-BEyjwjiN.js";function t(a){return o({url:"/api/load-page-conf/list",method:"get",params:a})}function n(a){return o({url:`/api/load-page-conf/${a}`,method:"get"})}function r(a){return o({url:"/api/load-page-conf",method:"post",data:a})}function u(a){return o({url:"/api/load-page-conf",method:"put",data:a})}function d(){return o({url:"/api/load-page-conf/all",method:"get"})}export{t as a,n as b,r as c,d as g,u};
+import{r as o}from"./request-B37nuy4Q.js";function t(a){return o({url:"/api/load-page-conf/list",method:"get",params:a})}function n(a){return o({url:`/api/load-page-conf/${a}`,method:"get"})}function r(a){return o({url:"/api/load-page-conf",method:"post",data:a})}function u(a){return o({url:"/api/load-page-conf",method:"put",data:a})}function d(){return o({url:"/api/load-page-conf/all",method:"get"})}export{t as a,n as b,r as c,d as g,u};

+ 1 - 1
portal/dist/assets/ossFile-TqbRhC6L.js → portal/dist/assets/ossFile-0jH69E28.js

@@ -1 +1 @@
-import{r as t}from"./request-BEyjwjiN.js";function i(e){return t({timeout:12e5,url:"/api/oss-file/upload",method:"post",data:e,headers:{"Content-Type":"multipart/form-data"}})}function o(e){return t({url:"/api/oss-file/list",method:"get",params:e})}function r(e){return t({url:`/api/oss-file/${e}`,method:"delete"})}function l(e){return t({url:"/api/oss-file/batch",method:"delete",params:{fileIds:e}})}export{l as b,r as d,o as g,i as u};
+import{r as t}from"./request-B37nuy4Q.js";function i(e){return t({timeout:12e5,url:"/api/oss-file/upload",method:"post",data:e,headers:{"Content-Type":"multipart/form-data"}})}function o(e){return t({url:"/api/oss-file/list",method:"get",params:e})}function r(e){return t({url:`/api/oss-file/${e}`,method:"delete"})}function l(e){return t({url:"/api/oss-file/batch",method:"delete",params:{fileIds:e}})}export{l as b,r as d,o as g,i as u};

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
portal/dist/assets/request-B37nuy4Q.js


+ 1 - 1
portal/dist/assets/user-Cl1SErrj.js → portal/dist/assets/user-D0nb7Crc.js

@@ -1 +1 @@
-import{r as e}from"./request-BEyjwjiN.js";function t(){return e({url:"/api/user/list",method:"get"})}function u(r){return e({url:"/api/user/info",method:"get",params:r})}function n(r){return e({url:"/api/user/user-token-url",method:"get",params:r})}function o(r){return e({url:"/api/user/login",method:"post",params:r})}function a(r){return e({url:"/api/user/change-password",method:"post",params:r})}function i(r){return e({url:"/api/user/save",method:"post",params:r})}export{u as a,t as b,a as c,n as g,o as l,i as s};
+import{r as e}from"./request-B37nuy4Q.js";function t(){return e({url:"/api/user/list",method:"get"})}function u(r){return e({url:"/api/user/info",method:"get",params:r})}function n(r){return e({url:"/api/user/user-token-url",method:"get",params:r})}function o(r){return e({url:"/api/user/login",method:"post",params:r})}function a(r){return e({url:"/api/user/change-password",method:"post",params:r})}function i(r){return e({url:"/api/user/save",method:"post",params:r})}export{u as a,t as b,a as c,n as g,o as l,i as s};

+ 1 - 1
portal/dist/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>腾讯广告自动化管理后台</title>
-    <script type="module" crossorigin src="/assets/index-D1zWqXGe.js"></script>
+    <script type="module" crossorigin src="/assets/index-B9XIvkCG.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-5iqyiYFJ.css">
   </head>
   <body>

+ 2 - 2
portal/src/views/daily-creative-report/index.vue

@@ -136,13 +136,13 @@
             </el-button>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="adgroupId" label="广告ID" width="120" >
+        <el-table-column prop="adgroupId" label="广告ID" width="120" >
           <template #default="{ row }">
             <el-button v-if="row.adgroupId > 0" type="primary" size="small"  link  @click="goToTencentByAdgroupId(row)">
               {{ row.adgroupId }}
             </el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="dynamicCreativeId" label="创意ID" width="120" >
           <template #default="{ row }">
             <el-button v-if="row.dynamicCreativeId > 0" type="primary" size="small"  link  @click="goToTencentCreative(row)">

+ 6 - 6
src/main/resources/mapper/RepDailyCreativeReportMapper.xml

@@ -5,7 +5,7 @@
     <!-- 插入或更新(REPORTING_TIME 口径)唯一键: group_id + account_id + dynamic_creative_id + date -->
     <insert id="upsert" parameterType="com.moka.gdtauto.entity.RepDailyCreativeReport">
         INSERT INTO rep_daily_creative_report (
-            conf_id, group_id, group_name, account_id, dynamic_creative_id, dynamic_creative_name, date,
+            conf_id, group_id, group_name, account_id, adgroup_id, adgroup_name,  dynamic_creative_id, dynamic_creative_name, date,
             view_count, view_user_count, avg_view_per_user,
             valid_click_count, click_user_count, cpc, ctr,
             valuable_click_count, valuable_click_cost, valuable_click_rate,
@@ -69,7 +69,7 @@
             income_val_7, income_roi_7, income_val_14, income_roi_14,
             income_val_24h, income_roi_1_24h
         ) VALUES (
-            #{report.confId}, #{report.groupId}, #{report.groupName}, #{report.accountId}, #{report.dynamicCreativeId}, #{report.dynamicCreativeName}, #{report.date},
+            #{report.confId}, #{report.groupId}, #{report.groupName}, #{report.accountId}, #{report.adgroupId}, #{report.adgroupName},  #{report.dynamicCreativeId}, #{report.dynamicCreativeName}, #{report.date},
             #{report.viewCount}, #{report.viewUserCount}, #{report.avgViewPerUser},
             #{report.validClickCount}, #{report.clickUserCount}, #{report.cpc}, #{report.ctr},
             #{report.valuableClickCount}, #{report.valuableClickCost}, #{report.valuableClickRate},
@@ -133,7 +133,7 @@
             #{report.incomeVal7}, #{report.incomeRoi7}, #{report.incomeVal14}, #{report.incomeRoi14},
             #{report.incomeVal24h}, #{report.incomeRoi124h}
         ) ON DUPLICATE KEY UPDATE
-            group_name = VALUES(group_name),
+            group_name = VALUES(group_name), adgroup_id = VALUES(adgroup_id), adgroup_name = VALUES(adgroup_name),
             view_count = VALUES(view_count), view_user_count = VALUES(view_user_count), avg_view_per_user = VALUES(avg_view_per_user),
             valid_click_count = VALUES(valid_click_count), click_user_count = VALUES(click_user_count), cpc = VALUES(cpc), ctr = VALUES(ctr),
             valuable_click_count = VALUES(valuable_click_count), valuable_click_cost = VALUES(valuable_click_cost), valuable_click_rate = VALUES(valuable_click_rate),
@@ -201,7 +201,7 @@
     <!-- 批量插入或更新(REPORTING_TIME 口径)-->
     <insert id="batchUpsert" parameterType="java.util.List">
         INSERT INTO rep_daily_creative_report (
-            conf_id, group_id, group_name, account_id, dynamic_creative_id, dynamic_creative_name, date,
+            conf_id, group_id, group_name, account_id, adgroup_id, adgroup_name, dynamic_creative_id, dynamic_creative_name, date,
             view_count, view_user_count, avg_view_per_user,
             valid_click_count, click_user_count, cpc, ctr,
             valuable_click_count, valuable_click_cost, valuable_click_rate,
@@ -267,7 +267,7 @@
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-                #{item.confId}, #{item.groupId}, #{item.groupName}, #{item.accountId}, #{item.dynamicCreativeId}, #{item.dynamicCreativeName}, #{item.date},
+                #{item.confId}, #{item.groupId}, #{item.groupName}, #{item.accountId}, #{item.adgroupId}, #{item.adgroupName}, #{item.dynamicCreativeId}, #{item.dynamicCreativeName}, #{item.date},
                 #{item.viewCount}, #{item.viewUserCount}, #{item.avgViewPerUser},
                 #{item.validClickCount}, #{item.clickUserCount}, #{item.cpc}, #{item.ctr},
                 #{item.valuableClickCount}, #{item.valuableClickCost}, #{item.valuableClickRate},
@@ -333,7 +333,7 @@
             )
         </foreach>
         ON DUPLICATE KEY UPDATE
-            group_name = VALUES(group_name),
+            group_name = VALUES(group_name), adgroup_id = VALUES(adgroup_id), adgroup_name = VALUES(adgroup_name),
             view_count = VALUES(view_count), view_user_count = VALUES(view_user_count), avg_view_per_user = VALUES(avg_view_per_user),
             valid_click_count = VALUES(valid_click_count), click_user_count = VALUES(click_user_count), cpc = VALUES(cpc), ctr = VALUES(ctr),
             valuable_click_count = VALUES(valuable_click_count), valuable_click_cost = VALUES(valuable_click_cost), valuable_click_rate = VALUES(valuable_click_rate),

+ 6 - 6
src/main/resources/mapper/ReqDailyCreativeReportMapper.xml

@@ -5,7 +5,7 @@
     <!-- 插入或更新(REQUEST_TIME 口径)唯一键: group_id + account_id + dynamic_creative_id + date -->
     <insert id="upsert" parameterType="com.moka.gdtauto.entity.ReqDailyCreativeReport">
         INSERT INTO req_daily_creative_report (
-            conf_id, group_id, group_name, account_id, dynamic_creative_id, dynamic_creative_name, date,
+            conf_id, group_id, group_name, account_id, adgroup_id, adgroup_name, dynamic_creative_id, dynamic_creative_name, date,
             view_count, view_user_count, avg_view_per_user,
             valid_click_count, click_user_count, cpc, ctr,
             valuable_click_count, valuable_click_cost, valuable_click_rate,
@@ -69,7 +69,7 @@
             income_val_7, income_roi_7, income_val_14, income_roi_14,
             income_val_24h, income_roi_1_24h
         ) VALUES (
-            #{report.confId}, #{report.groupId}, #{report.groupName}, #{report.accountId}, #{report.dynamicCreativeId}, #{report.dynamicCreativeName}, #{report.date},
+            #{report.confId}, #{report.groupId}, #{report.groupName}, #{report.accountId}, #{report.adgroupId}, #{report.adgroupName}, #{report.dynamicCreativeId}, #{report.dynamicCreativeName}, #{report.date},
             #{report.viewCount}, #{report.viewUserCount}, #{report.avgViewPerUser},
             #{report.validClickCount}, #{report.clickUserCount}, #{report.cpc}, #{report.ctr},
             #{report.valuableClickCount}, #{report.valuableClickCost}, #{report.valuableClickRate},
@@ -133,7 +133,7 @@
             #{report.incomeVal7}, #{report.incomeRoi7}, #{report.incomeVal14}, #{report.incomeRoi14},
             #{report.incomeVal24h}, #{report.incomeRoi124h}
         ) ON DUPLICATE KEY UPDATE
-            group_name = VALUES(group_name),
+            group_name = VALUES(group_name), adgroup_id = VALUES(adgroup_id), adgroup_name = VALUES(adgroup_name),
             view_count = VALUES(view_count), view_user_count = VALUES(view_user_count), avg_view_per_user = VALUES(avg_view_per_user),
             valid_click_count = VALUES(valid_click_count), click_user_count = VALUES(click_user_count), cpc = VALUES(cpc), ctr = VALUES(ctr),
             valuable_click_count = VALUES(valuable_click_count), valuable_click_cost = VALUES(valuable_click_cost), valuable_click_rate = VALUES(valuable_click_rate),
@@ -201,7 +201,7 @@
     <!-- 批量插入或更新(REQUEST_TIME 口径)-->
     <insert id="batchUpsert" parameterType="java.util.List">
         INSERT INTO req_daily_creative_report (
-            conf_id, group_id, group_name, account_id, dynamic_creative_id, dynamic_creative_name, date,
+            conf_id, group_id, group_name, account_id, adgroup_id, adgroup_name, dynamic_creative_id, dynamic_creative_name, date,
             view_count, view_user_count, avg_view_per_user,
             valid_click_count, click_user_count, cpc, ctr,
             valuable_click_count, valuable_click_cost, valuable_click_rate,
@@ -267,7 +267,7 @@
         ) VALUES
         <foreach collection="list" item="item" separator=",">
             (
-                #{item.confId}, #{item.groupId}, #{item.groupName}, #{item.accountId}, #{item.dynamicCreativeId}, #{item.dynamicCreativeName}, #{item.date},
+                #{item.confId}, #{item.groupId}, #{item.groupName}, #{item.accountId}, #{item.adgroupId}, #{item.adgroupName}, #{item.dynamicCreativeId}, #{item.dynamicCreativeName}, #{item.date},
                 #{item.viewCount}, #{item.viewUserCount}, #{item.avgViewPerUser},
                 #{item.validClickCount}, #{item.clickUserCount}, #{item.cpc}, #{item.ctr},
                 #{item.valuableClickCount}, #{item.valuableClickCost}, #{item.valuableClickRate},
@@ -333,7 +333,7 @@
             )
         </foreach>
         ON DUPLICATE KEY UPDATE
-            group_name = VALUES(group_name),
+            group_name = VALUES(group_name), adgroup_id = VALUES(adgroup_id), adgroup_name = VALUES(adgroup_name),
             view_count = VALUES(view_count), view_user_count = VALUES(view_user_count), avg_view_per_user = VALUES(avg_view_per_user),
             valid_click_count = VALUES(valid_click_count), click_user_count = VALUES(click_user_count), cpc = VALUES(cpc), ctr = VALUES(ctr),
             valuable_click_count = VALUES(valuable_click_count), valuable_click_cost = VALUES(valuable_click_cost), valuable_click_rate = VALUES(valuable_click_rate),

Некоторые файлы не были показаны из-за большого количества измененных файлов