瀏覽代碼

feat:调整日预算

pudongliang 4 月之前
父節點
當前提交
fedc2f3b69
共有 32 個文件被更改,包括 34 次插入23 次删除
  1. 1 1
      portal/dist/assets/accountGroup-BLipnR02.js
  2. 1 1
      portal/dist/assets/adAutoConf-GS3SuqL-.js
  3. 1 1
      portal/dist/assets/adPlanConf-A0oYrC-2.js
  4. 1 1
      portal/dist/assets/auth-Bptu5k7x.js
  5. 1 1
      portal/dist/assets/conversion-Na3oz1QG.js
  6. 0 0
      portal/dist/assets/detail-DwD1uj6v.js
  7. 1 1
      portal/dist/assets/drama-ZyAZKfsd.js
  8. 0 0
      portal/dist/assets/edit-DLwOGrCs.js
  9. 0 0
      portal/dist/assets/index-4-Mdp0oW.js
  10. 0 0
      portal/dist/assets/index-BIrfW1Cu.js
  11. 0 0
      portal/dist/assets/index-BVl-VU3g.js
  12. 0 0
      portal/dist/assets/index-Bu56wth3.js
  13. 0 0
      portal/dist/assets/index-C2vLKCDr.js
  14. 0 0
      portal/dist/assets/index-CN2Q9FS6.js
  15. 0 0
      portal/dist/assets/index-DDY2ldRR.js
  16. 0 0
      portal/dist/assets/index-DIsb9oWW.js
  17. 0 0
      portal/dist/assets/index-DIyHYGD4.js
  18. 0 0
      portal/dist/assets/index-DgFhTWJu.js
  19. 0 0
      portal/dist/assets/index-SmgRthAF.js
  20. 0 0
      portal/dist/assets/index-TXf3e9fP.js
  21. 1 1
      portal/dist/assets/index-UHWlNWtX.js
  22. 0 0
      portal/dist/assets/index-hqErf5GQ.js
  23. 0 0
      portal/dist/assets/index-xZxP4MKU.js
  24. 1 1
      portal/dist/assets/loadPageConf-C--S4MdQ.js
  25. 1 1
      portal/dist/assets/ossFile-DgFqNsKA.js
  26. 0 0
      portal/dist/assets/request-5NUJpU2H.js
  27. 1 1
      portal/dist/assets/user-CqT7Wv7I.js
  28. 1 1
      portal/dist/index.html
  29. 5 0
      portal/src/views/ad-plan-conf/detail.vue
  30. 15 5
      src/main/java/com/moka/gdtauto/controller/AdAutoConfController.java
  31. 2 6
      src/main/java/com/moka/gdtauto/entity/AdAutoExecuteLog.java
  32. 1 1
      src/main/java/com/moka/gdtauto/service/AdPlanAutoExecutor.java

+ 1 - 1
portal/dist/assets/accountGroup-D4iExezf.js → portal/dist/assets/accountGroup-BLipnR02.js

@@ -1 +1 @@
-import{r as u}from"./request-PomTB9D2.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-5NUJpU2H.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-CaLAYbMW.js → portal/dist/assets/adAutoConf-GS3SuqL-.js

@@ -1 +1 @@
-import{r as e}from"./request-PomTB9D2.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 i(t){return e({url:`/api/ad-auto-conf/execute?id=${t}`,method:"post"})}function d(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,d as b,n as c,i as e,u as g,a as s,r as u};
+import{r as e}from"./request-5NUJpU2H.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 i(t){return e({url:`/api/ad-auto-conf/execute?id=${t}`,method:"post"})}function d(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,d as b,n as c,i as e,u as g,a as s,r as u};

+ 1 - 1
portal/dist/assets/adPlanConf-D0icJvFt.js → portal/dist/assets/adPlanConf-A0oYrC-2.js

@@ -1 +1 @@
-import{r as a}from"./request-PomTB9D2.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-5NUJpU2H.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-BPa_ueG1.js → portal/dist/assets/auth-Bptu5k7x.js

@@ -1 +1 @@
-import{r as t}from"./request-PomTB9D2.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-5NUJpU2H.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-DD7BJ4Ku.js → portal/dist/assets/conversion-Na3oz1QG.js

@@ -1 +1 @@
-import{r as t}from"./request-PomTB9D2.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-5NUJpU2H.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};

File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/detail-DwD1uj6v.js


+ 1 - 1
portal/dist/assets/drama-D2aCYi9U.js → portal/dist/assets/drama-ZyAZKfsd.js

@@ -1 +1 @@
-import{r as t}from"./request-PomTB9D2.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-5NUJpU2H.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};

File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/edit-DLwOGrCs.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-4-Mdp0oW.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-BIrfW1Cu.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-BVl-VU3g.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-Bu56wth3.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-C2vLKCDr.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-CN2Q9FS6.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-DDY2ldRR.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-DIsb9oWW.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-DIyHYGD4.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-DgFhTWJu.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-SmgRthAF.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-TXf3e9fP.js


File diff suppressed because it is too large
+ 1 - 1
portal/dist/assets/index-UHWlNWtX.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-hqErf5GQ.js


File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/index-xZxP4MKU.js


+ 1 - 1
portal/dist/assets/loadPageConf-M2uIQEWT.js → portal/dist/assets/loadPageConf-C--S4MdQ.js

@@ -1 +1 @@
-import{r as o}from"./request-PomTB9D2.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-5NUJpU2H.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-C9UAGcrC.js → portal/dist/assets/ossFile-DgFqNsKA.js

@@ -1 +1 @@
-import{r as t}from"./request-PomTB9D2.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-5NUJpU2H.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};

File diff suppressed because it is too large
+ 0 - 0
portal/dist/assets/request-5NUJpU2H.js


+ 1 - 1
portal/dist/assets/user-CkmSKTKY.js → portal/dist/assets/user-CqT7Wv7I.js

@@ -1 +1 @@
-import{r as e}from"./request-PomTB9D2.js";function s(){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})}export{u as a,s as b,a as c,n as g,o as l};
+import{r as e}from"./request-5NUJpU2H.js";function s(){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})}export{u as a,s as b,a as c,n as g,o as l};

+ 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-B1j8uODc.js"></script>
+    <script type="module" crossorigin src="/assets/index-UHWlNWtX.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Da8TWetk.css">
   </head>
   <body>

+ 5 - 0
portal/src/views/ad-plan-conf/detail.vue

@@ -420,6 +420,11 @@
             {{ row.cost && (row.cost / 100).toFixed(2) || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="预算" prop="dailyBudget" width="100">
+          <template #default="{ row }">
+            {{ row.dailyBudget && (row.dailyBudget / 100).toFixed(2) || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="目标转化成本" prop="conversionsCost" width="120">
           <template #default="{ row }">
             {{ row.conversionsCost && (row.conversionsCost / 100).toFixed(2) || '-' }}

+ 15 - 5
src/main/java/com/moka/gdtauto/controller/AdAutoConfController.java

@@ -1,5 +1,18 @@
 package com.moka.gdtauto.controller;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,11 +31,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>
@@ -42,6 +50,7 @@ public class AdAutoConfController {
     private final AdAutoConfService adAutoConfService;
     private final AdAutoConfMapper adAutoConfMapper;
     private final AdPlanCreativeAutoExecutor adPlanCreativeAutoExecutor;
+    private final AdPlanAutoExecutor adPlanAutoExecutor;
 
     /**
      * 分页查询广告自动划配置列表
@@ -168,6 +177,7 @@ public class AdAutoConfController {
             if (conf == null) {
                 return Result.fail("广告自动划配置不存在");
             }
+            adPlanAutoExecutor.asyncExecute(conf);
             adPlanCreativeAutoExecutor.asyncExecute(conf);
             return Result.success("执行中,请稍候");
         } catch (Exception e) {

+ 2 - 6
src/main/java/com/moka/gdtauto/entity/AdAutoExecuteLog.java

@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
 
 /**
  * <p>
@@ -19,9 +17,7 @@ import lombok.ToString;
  * @author mokamvp
  * @since 2026-03-12
  */
-@Getter
-@Setter
-@ToString
+@Data
 @TableName("ad_auto_execute_log")
 public class AdAutoExecuteLog implements Serializable {
 

+ 1 - 1
src/main/java/com/moka/gdtauto/service/AdPlanAutoExecutor.java

@@ -203,7 +203,7 @@ public class AdPlanAutoExecutor {
 
             log.info("[AdAutoExecutor] confId={} 巡检:广告数={}, 提日预算数={}", confId, adCount, plansToAddDailyBudget.size());
             executeLog.setAdCount(adCount);
-            executeLog.setSuspendCount(plansToSuspend.size());
+            executeLog.setSuspendCount(plansToAddDailyBudget.size());
             executeLog.setExecuteStatus(1);
             executeLog.setSuspendAdGroupIds(plansToSuspend.stream().map(x -> String.format("[%d-%d-{%s}]", x.getAdgroupId(), x.getDailyBudget(), x.getAdgroupName())).collect(Collectors.joining("\n")));
             executeLog.setExecuteResult("成功");

Some files were not shown because too many files changed in this diff