pudongliang 4 місяців тому
батько
коміт
9be8313dee

+ 2 - 2
for_push.sh

@@ -8,9 +8,9 @@ git add .
 echo "========== Git status =========="
 git status
 
-// 读参数提交信息
+# 读参数提交信息
 param1=$1
 
 echo "========== Git commiting =========="
 echo "Commit message: $param1"
-// git commit -m "$param1"
+git commit -m "$param1"

+ 1 - 1
portal/dist/assets/accountGroup-BJssH6-4.js → portal/dist/assets/accountGroup-BeYNEMzT.js

@@ -1 +1 @@
-import{r as u}from"./request-DnCTS0Ee.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-tl58KW-y.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/adPlanConf-DDHyZi2K.js → portal/dist/assets/adPlanConf-BRBjuefQ.js

@@ -1 +1 @@
-import{r as a}from"./request-DnCTS0Ee.js";function r(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 l(n){return a({url:`/api/ad-plan-conf/reGeneratePlan/${n}`,method:"get"})}function d(n){return a({url:"/api/ad-plan-conf/create",method:"post",data:n})}function u(n){return a({url:"/api/ad-plan-conf/update",method:"post",data:n})}function p(n){return a({url:`/api/ad-plan-conf/${n}`,method:"delete"})}function i(n=1,e=10){return a({url:"/api/ad-plan-conf/list",method:"get",params:{pageNum:n,pageSize:e}})}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 s(n){return a({url:`/api/ad-plan-creative/plan/${n}`,method:"get"})}export{o as a,f as b,d as c,p as d,c as e,l as f,i as g,s as h,r,u};
+import{r as a}from"./request-tl58KW-y.js";function r(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 l(n){return a({url:`/api/ad-plan-conf/reGeneratePlan/${n}`,method:"get"})}function d(n){return a({url:"/api/ad-plan-conf/create",method:"post",data:n})}function u(n){return a({url:"/api/ad-plan-conf/update",method:"post",data:n})}function p(n){return a({url:`/api/ad-plan-conf/${n}`,method:"delete"})}function i(n=1,e=10){return a({url:"/api/ad-plan-conf/list",method:"get",params:{pageNum:n,pageSize:e}})}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 s(n){return a({url:`/api/ad-plan-creative/plan/${n}`,method:"get"})}export{o as a,f as b,d as c,p as d,c as e,l as f,i as g,s as h,r,u};

+ 1 - 1
portal/dist/assets/auth-BZ6E5D1a.js → portal/dist/assets/auth-CqkUtP0_.js

@@ -1 +1 @@
-import{r as t}from"./request-DnCTS0Ee.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-tl58KW-y.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-DOEK-zRB.js → portal/dist/assets/conversion-P3Cckzrt.js

@@ -1 +1 @@
-import{r as t}from"./request-DnCTS0Ee.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-tl58KW-y.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-CHjQ2-__.js


+ 1 - 1
portal/dist/assets/drama-5UzMCiFs.js → portal/dist/assets/drama-BYJHDor5.js

@@ -1 +1 @@
-import{r as t}from"./request-DnCTS0Ee.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-tl58KW-y.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/index-B70oFvLO.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-BAsUwuTl.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-BcVzUPY1.js


Різницю між файлами не показано, бо вона завелика
+ 1 - 1
portal/dist/assets/index-BmvEak8n.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-CGAahtLH.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-CdhMa5Hw.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-Cn1YGyb1.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-Cnd95bZM.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-Cyl7aS9W.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-DAsPgv5D.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-bsRRhJDA.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-fRu5NRn7.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
portal/dist/assets/index-x-kYepUb.js


+ 1 - 1
portal/dist/assets/ossFile-CM3DCBds.js → portal/dist/assets/ossFile-CSxBtP3Y.js

@@ -1 +1 @@
-import{r as t}from"./request-DnCTS0Ee.js";function i(e){return t({timeout:3e5,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-tl58KW-y.js";function i(e){return t({timeout:3e5,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-tl58KW-y.js


+ 1 - 1
portal/dist/assets/user-BZ8QcBPh.js → portal/dist/assets/user-GjOhxWtL.js

@@ -1 +1 @@
-import{r as e}from"./request-DnCTS0Ee.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-tl58KW-y.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-Crpis3o1.js"></script>
+    <script type="module" crossorigin src="/assets/index-BmvEak8n.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BeI5MTU7.css">
   </head>
   <body>

+ 7 - 3
portal/src/views/ad-plan-conf/index.vue

@@ -39,7 +39,9 @@
               {{ getPlanStatusText(row.status) }}
             </el-tag>
           </template>
-          </el-table-column>   
+          </el-table-column>  
+          <el-table-column prop="failReason" label="原因" width="100" show-overflow-tooltip>
+          </el-table-column> 
         <el-table-column label="广告类型" width="150">
           <template #default="{ row }">
             <el-tag :type="getAdTypeColor(row.adType)">
@@ -685,7 +687,8 @@ const getPlanStatusText = (status) => {
     1: '待执行',
     2: '执行中',
     3: '失败',
-    4: '已结束'       
+    4: '已结束',
+    5: '部分失败'       
   }
   return statusMap[status] || '未知'
 }
@@ -695,7 +698,8 @@ const getPlanStatusColor = (status) => {
     1: 'info',
     2: 'success',
     3: 'danger',
-    4: 'success'
+    4: 'success',
+    5: 'danger'
   }
   return colorMap[status] || 'info'
 }

+ 3 - 0
src/main/java/com/moka/gdtauto/common/AdPlanStatus.java

@@ -23,6 +23,9 @@ public class AdPlanStatus {
      * 失败
      */
     public static final Integer FAILED = 3;
+
+    // 部分失败
+    public static final Integer PART_FAILED = 5;
     
     /**
      * 已结束(成功)

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

@@ -551,7 +551,7 @@ public class AdPlanConfServiceImpl extends ServiceImpl<AdPlanConfMapper, AdPlanC
             conf.setStatus(AdPlanStatus.FAILED); // 全部失败
             conf.setFailReason("所有广告创建失败");
         } else {
-            conf.setStatus(AdPlanStatus.FAILED); // 部分失败
+            conf.setStatus(AdPlanStatus.PART_FAILED); // 部分失败
             conf.setFailReason(String.format("成功%d个,失败%d个", successCount, failCount));
         }
         

Деякі файли не було показано, через те що забагато файлів було змінено