fix:巡检规则

portal/dist/assets/accountGroup-dgnNh0_E.js → portal/dist/assets/accountGroup-Br4sTD18.js

@@ -1 +1 @@
-import{r as u}from"./request-BpwVWazc.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--78cnU4J.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/adAutoConf-D-dwKsyu.js

@@ -1 +0,0 @@
-import{r as e}from"./request-BpwVWazc.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/execute?id=${t}`,method:"post"})}function i(t){return e({url:"/api/execute-log/list",method:"get",params:t})}function d(t){return e({url:"/api/execute-log/getChildLog",method:"get",params:t})}export{d as a,i as b,n as c,r as e,u as g,a as s};

portal/dist/assets/adAutoConf-DDNIEd4C.js

@@ -0,0 +1 @@
+import{r as e}from"./request--78cnU4J.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};

portal/dist/assets/adPlanConf-DE_JQa6C.js → portal/dist/assets/adPlanConf-DbzvFCYO.js

@@ -1 +1 @@
-import{r as a}from"./request-BpwVWazc.js";function r(n){return a({url:"/api/ad-plan-conf/reCreate",method:"post",data:n})}function d(n){return a({url:"/api/ad-plan-conf/generate-plan",method:"post",data:n})}function o(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 u(n){return a({url:"/api/ad-plan-conf/create",method:"post",data:n})}function p(n){return a({url:"/api/ad-plan-conf/update",method:"post",data:n})}function s(n=1,t=10){return a({url:"/api/ad-plan-conf/list",method:"get",params:{pageNum:n,pageSize:t}})}function f(n){return a({url:`/api/ad-plan-conf/${n}`,method:"get"})}function i(n){return a({url:"/api/ad-plan/list",method:"get",params:n})}function c(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 g(n){return a({url:"/api/ad-plan-conf/gdtDeleteByConfId",params:{confId:n},method:"get"})}function h(n,t){return a({url:`/api/ad-plan-conf/gdtSuspendByPlanIds/${n}`,method:"post",data:t})}function P(n,t){return a({url:`/api/ad-plan-conf/gdtDeleteByPlanIds/${n}`,method:"post",data:t})}export{d as a,f as b,u as c,i as d,g as e,h as f,s as g,P as h,l as i,o as j,c as k,r,m as s,p as u};
+import{r as a}from"./request--78cnU4J.js";function r(n){return a({url:"/api/ad-plan-conf/reCreate",method:"post",data:n})}function d(n){return a({url:"/api/ad-plan-conf/generate-plan",method:"post",data:n})}function o(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 u(n){return a({url:"/api/ad-plan-conf/create",method:"post",data:n})}function p(n){return a({url:"/api/ad-plan-conf/update",method:"post",data:n})}function s(n=1,t=10){return a({url:"/api/ad-plan-conf/list",method:"get",params:{pageNum:n,pageSize:t}})}function f(n){return a({url:`/api/ad-plan-conf/${n}`,method:"get"})}function i(n){return a({url:"/api/ad-plan/list",method:"get",params:n})}function c(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 g(n){return a({url:"/api/ad-plan-conf/gdtDeleteByConfId",params:{confId:n},method:"get"})}function h(n,t){return a({url:`/api/ad-plan-conf/gdtSuspendByPlanIds/${n}`,method:"post",data:t})}function P(n,t){return a({url:`/api/ad-plan-conf/gdtDeleteByPlanIds/${n}`,method:"post",data:t})}export{d as a,f as b,u as c,i as d,g as e,h as f,s as g,P as h,l as i,o as j,c as k,r,m as s,p as u};

portal/dist/assets/auth-B4ojHnaw.js → portal/dist/assets/auth-CEHXCeVq.js

@@ -1 +1 @@
-import{r as t}from"./request-BpwVWazc.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--78cnU4J.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-CKV6J1pL.js → portal/dist/assets/conversion-BbQh4OpM.js

@@ -1 +1 @@
-import{r as t}from"./request-BpwVWazc.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--78cnU4J.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/drama-C7btxxFK.js → portal/dist/assets/drama-BOlD9Mfg.js

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

portal/dist/assets/edit-DAIlljRi.css

@@ -0,0 +1 @@
+.rules-container[data-v-43af07fb]{max-height:500px;overflow-y:auto}.rule-item[data-v-43af07fb]{border:1px solid #e5e7eb}

portal/dist/assets/edit-DT7D7mtj.css

@@ -1 +0,0 @@
-.rules-container[data-v-35a3def7]{max-height:500px;overflow-y:auto}.rule-item[data-v-35a3def7]{border:1px solid #e5e7eb}

portal/dist/assets/loadPageConf-HQ_2FVzL.js → portal/dist/assets/loadPageConf-B_-xDZOo.js

@@ -1 +1 @@
-import{r as o}from"./request-BpwVWazc.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--78cnU4J.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};

portal/dist/assets/ossFile-Qy_pvXpR.js → portal/dist/assets/ossFile-CvEIL9y7.js

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

portal/dist/assets/user-DLQDMqxD.js → portal/dist/assets/user-DGkBMF9v.js

@@ -1 +1 @@
-import{r as e}from"./request-BpwVWazc.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--78cnU4J.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-BVHF367N.js"></script>
+    <script type="module" crossorigin src="/assets/index-cn7DImZa.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-Cb0Z9rAk.css">
   </head>
   <body>

portal/src/api/adAutoConf.js

@@ -32,6 +32,14 @@ export function saveAdAutoConf(data) {
   })
 }
 
+export function updateAutoConf(data) {
+  return request({
+    url: '/api/ad-auto-conf/update',
+    method: 'post',
+    data
+  })
+}
+
 /**
  * 删除广告自动划配置
  */

portal/src/views/ad-auto-conf/edit.vue

@@ -109,7 +109,8 @@ import { ElMessage } from 'element-plus'
 import { Plus, Delete, ArrowLeft } from '@element-plus/icons-vue'
 import {
   getAdAutoConfDetail,
-  saveAdAutoConf
+  saveAdAutoConf,
+  updateAutoConf
 } from '@/api/adAutoConf'
 import { getAccountGroupListAll } from '@/api/accountGroup'
 
@@ -240,13 +241,16 @@ const handleSubmit = async () => {
     submitting.value = true
     try {
       const data = {
+        id: form.id,
         ruleName: form.ruleName,
         jobNumber: form.jobNumber,
         adGroupId: form.adGroupId,
         newAdDays: form.newAdDays,
         rules: JSON.stringify(form.rules)
       }
-
+      if (isEdit.value) {
+        const response = await updateAutoConf(data)
+      }
       const response = await saveAdAutoConf(data)
 
       if (response.success) {

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

@@ -63,11 +63,8 @@
       <!-- 搜索筛选 -->
       <div class="mb-6 p-4 bg-gray-50 rounded-lg">
         <el-form :inline="true" :model="queryForm" class="flex flex-wrap gap-4">
-          <el-form-item label="工号">
-            <el-input v-model="queryForm.jobNumber" placeholder="请输入工号" clearable style="width: 200px" />
-          </el-form-item>
-          <el-form-item label="广告组ID">
-            <el-input v-model.number="queryForm.adGroupId" placeholder="请输入广告组ID" clearable style="width: 200px" />
+          <el-form-item label="名称">
+            <el-input v-model="queryForm.ruleName" placeholder="请输入名称" clearable style="width: 200px" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleQuery">查询</el-button>
@@ -115,9 +112,6 @@
         <el-table-column prop="id" label="ID" width="80" />
         <el-table-column prop="ruleName" label="规则名称" width="120" />
         <el-table-column prop="adGroupId" label="广告组ID" width="120">
-          <template #default="{ row }">
-            <span>{{ row.adGroupId === 0 ? '全部' : row.adGroupId }}</span>
-          </template>
         </el-table-column>
         <el-table-column prop="newAdDays" label="新广告天数" width="120" />
         <el-table-column label="规则数量" width="100">

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

@@ -553,6 +553,7 @@
           style="width: 200px"
         />
         <el-select
+          @change="loadFileList"
           v-model="fileSearchParams.fileType"
           placeholder="选择文件类型"
           style="width: 120px"
@@ -1027,12 +1028,6 @@ const generatePlanBtnLoading = ref(false)
 const handleGeneratePlan = async () => {
     await formRef.value.validate()
     const { adType, dramaId, dramaAmount } = formData.value
-  if (adType === 2) {
-    if (dramaId == null && dramaAmount < 1) {
-      ElMessage.warning('请设置短剧配置')
-      return
-    }
-  }
     const data = { ...formData.value }
     data.id = editingId.value
     data.pageIds = data.pageIdArr.join(',')

src/main/java/com/moka/gdtauto/controller/AdAutoConfController.java

@@ -50,13 +50,11 @@ public class AdAutoConfController {
     public Result<Page<AdAutoConf>> list(
             @Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page,
             @Parameter(description = "每页数量") @RequestParam(defaultValue = "10") Long size,
-            @Parameter(description = "工号") @RequestParam(required = false) String jobNumber,
-            @Parameter(description = "广告组ID") @RequestParam(required = false) Long adGroupId) {
+            @Parameter(description = "ruleName") @RequestParam(required = false) String ruleName) {
         try {
             Page<AdAutoConf> pageParam = new Page<>(page, size);
             LambdaQueryWrapper<AdAutoConf> wrapper = new LambdaQueryWrapper<>();
-            wrapper.like(StringUtils.hasText(jobNumber), AdAutoConf::getJobNumber, jobNumber)
-                    .eq(adGroupId != null, AdAutoConf::getAdGroupId, adGroupId)
+            wrapper.like(StringUtils.hasText(ruleName), AdAutoConf::getRuleName, ruleName)
                     .orderByDesc(AdAutoConf::getCreateTime);
             Page<AdAutoConf> result = adAutoConfService.page(pageParam, wrapper);
             return Result.success(result);

src/main/java/com/moka/gdtauto/controller/AdPlanConfController.java

@@ -190,6 +190,10 @@ public class AdPlanConfController {
         Integer assetType = request.getAssetType();
         // 1随机2最新
         Integer assetModel = request.getAssetModel();
+        String targets = request.getTargets();
+        String sites = request.getSites();
+        String[] targetArray = targets.split(",");
+        String[] siteArray = sites.split(",");
         List<TencentAsset> dramaAssets = new ArrayList<>();
         List<TencentAsset> fictionAssets = new ArrayList<>();
         if (assetType == 1 && dramaAmount > 0) {
@@ -264,10 +268,7 @@ public class AdPlanConfController {
             }
         }
 
-        String targets = request.getTargets();
-        String sites = request.getSites();
-        String[] targetArray = targets.split(",");
-        String[] siteArray = sites.split(",");
+        
         int dramaIndex = 0;
         int fictionIndex = 0;
         int planIndex = 0;