feat: 重新创建

portal/dist/assets/accountGroup-BfdacBPh.js → portal/dist/assets/accountGroup-Be-EujPP.js

@@ -1 +1 @@
-import{r as u}from"./request-BkI0Euub.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-CnwMCDfl.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};

portal/dist/assets/adPlanConf-qFH883So.js → portal/dist/assets/adPlanConf-AHV-XREA.js

@@ -1 +1 @@
-import{r as a}from"./request-BkI0Euub.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-CnwMCDfl.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};

portal/dist/assets/auth-B_F01qmU.js → portal/dist/assets/auth-CkcdkDe4.js

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

portal/dist/assets/conversion-BrJTQhOm.js → portal/dist/assets/conversion-YHa7q_MZ.js

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

portal/dist/assets/ossFile-BC37tBA0.js → portal/dist/assets/ossFile-89X8uVQ2.js

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

portal/dist/assets/user-D20ylrAd.js → portal/dist/assets/user-w7nGTEQA.js

@@ -1 +1 @@
-import{r as e}from"./request-BkI0Euub.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-CnwMCDfl.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};

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

portal/src/views/ad-plan-conf/index.vue

@@ -122,6 +122,7 @@
 
         <el-form-item label="账号组ID" prop="accountGroupId">
           <el-select
+            :disabled="valueDisabled"
             v-model="formData.accountGroupId"
             style="width: 100%"
             placeholder="请选择账号组"
@@ -150,6 +151,7 @@
 
         <el-form-item label="转化ID" prop="conversionId">
           <el-select
+          :disabled="valueDisabled"
             v-model="formData.conversionId"
             :min="1"
             placeholder="请输入转化ID"
@@ -165,6 +167,7 @@
         </el-form-item>
          <el-form-item label="定向模版IDs" prop="targets">
           <el-input
+          :disabled="valueDisabled"
             v-model="formData.targets"
             type="textarea"
             :rows="2"
@@ -186,6 +189,7 @@
         </el-form-item>
          <el-form-item label="版位模版IDs" prop="sites">
           <el-input
+          :disabled="valueDisabled"
             v-model="formData.sites"
             type="textarea"
             :rows="2"
@@ -234,7 +238,7 @@
 
         <el-form-item label="创意图片/视频">
           <div class="flex flex-col gap-2">
-            <el-button size="small" @click="openFileSelector('creative')" style="width: fit-content">选择文件</el-button>
+            <el-button :disabled="valueDisabled" size="small" @click="openFileSelector('creative')" style="width: fit-content">选择文件</el-button>
             <div v-if="formData.creativeFileUrls" class="flex flex-wrap gap-2">
               <div
                 v-for="(url, index) in formData.creativeFileUrls.split(',')"
@@ -249,7 +253,8 @@
                   style="width: 80px; height: 80px; display: block"
                   class="cursor-pointer rounded border"
                 />
-                <div
+                <button
+                  :disabled="valueDisabled"
                   @click="removeFile('creative', index)"
                   class="absolute -top-1 -right-1 cursor-pointer bg-red-500 text-white rounded-full w-5 h-5 flex items-center justify-center hover:bg-red-600 transition-colors"
                   style="z-index: 10"
@@ -257,7 +262,7 @@
                   <el-icon :size="14">
                     <Close />
                   </el-icon>
-                </div>
+                </button>
               </div>
             </div>
           </div>
@@ -265,7 +270,7 @@
 
         <el-form-item label="品牌形象图片">
           <div class="flex flex-col gap-2">
-            <el-button size="small" @click="openFileSelector('brand')" style="width: fit-content">选择图片</el-button>
+            <el-button :disabled="valueDisabled" size="small" @click="openFileSelector('brand')" style="width: fit-content">选择图片</el-button>
             <div v-if="formData.brandImageUrl">
               <div class="relative inline-block">
                 <el-image
@@ -275,7 +280,8 @@
                   style="width: 80px; height: 80px; display: block"
                   class="cursor-pointer rounded border"
                 />
-                <div
+                <button
+                  :disabled="valueDisabled"
                   @click="removeFile('brand', 0)"
                   class="absolute -top-1 -right-1 cursor-pointer bg-red-500 text-white rounded-full w-5 h-5 flex items-center justify-center hover:bg-red-600 transition-colors"
                   style="z-index: 10"
@@ -283,7 +289,7 @@
                   <el-icon :size="14">
                     <Close />
                   </el-icon>
-                </div>
+                </button>
               </div>
             </div>
           </div>
@@ -387,6 +393,7 @@
       </el-table>
       <template #footer>
         <!--生成计划按钮tip提示先进行预览操作-->
+        <!-- ：1-待执行，2-执行中，3-失败，4-已结束 -->
         <el-tooltip
         v-if="formData.status === 1"
         class="box-item"
@@ -575,6 +582,11 @@ const formData = ref({
   jobNumber: ''
 })
 
+const valueDisabled = computed(() => {
+  // 1-待执行，2-执行中，3-失败，4-已结束
+  return formData.value.status  > 1
+})
+
 // 出价金额（元）
 const bidAmountYuan = computed({
   get: () => formData.value.bidAmount / 100,

portal/vite.config.js

@@ -14,7 +14,8 @@ export default defineConfig({
     port: 5173,
     proxy: {
       '/api': {
-        target: 'http://localhost:8080',
+        // target: 'http://localhost:8080',
+        target: 'https://ad-auto.mokamrp.com/api',
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, '')
       }

src/main/java/com/moka/gdtauto/service/impl/AdPlanConfServiceImpl.java

@@ -172,6 +172,11 @@ public class AdPlanConfServiceImpl extends ServiceImpl<AdPlanConfMapper, AdPlanC
         });
         adPlanService.updateBatchById(plans);
         List<AdPlanCreative> creatives = adPlanCreativeService.getCreativesByConfId(confId);
+        creatives.forEach(creative -> {
+            creative.setBrandName(conf.getBrandName());
+            creative.setCreativeText(conf.getCreativeText());
+            creative.setButtonText(conf.getButtonText());
+        });
         //group by planId
         Map<Long, List<AdPlanCreative>> creativeMap = creatives.stream().collect(Collectors.groupingBy(AdPlanCreative::getAdPlanId));
         for (AdPlan plan : plans) {