فهرست منبع

feat: 重新生成

pudongliang 4 ماه پیش
والد
کامیت
8d470ff47e

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

@@ -337,6 +337,13 @@ const fetchAdPlans = async () => {
         plan.creatives = []
         plan.creativesLoading = false
       })
+      
+      // 默认展开第一个广告计划并加载其创意
+      if (adPlanList.value.length > 0) {
+        const firstPlan = adPlanList.value[0]
+        expandedRows.value = [firstPlan.id]
+        await fetchCreatives(firstPlan)
+      }
     } else {
       ElMessage.error(res.msg || '获取广告计划列表失败')
     }

+ 1 - 0
portal/src/views/profile/index.vue

@@ -55,6 +55,7 @@
         <template #header>
           <div class="flex items-center justify-between">
             <span class="text-lg font-semibold">基本信息</span>
+            <el-button type="primary" @click="refreshUserInfo">刷新状态</el-button>
           </div>
         </template>
         <div class="space-y-4">

+ 4 - 1
src/main/java/com/moka/gdtauto/controller/DashboardController.java

@@ -1,6 +1,8 @@
 package com.moka.gdtauto.controller;
 
+import com.moka.gdtauto.annotation.AuthUser;
 import com.moka.gdtauto.common.Result;
+import com.moka.gdtauto.entity.SysUser;
 import com.moka.gdtauto.service.DashboardService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -123,9 +125,10 @@ public class DashboardController {
     @GetMapping("/recent-activities")
     @Operation(summary = "获取最近活动", description = "获取最近的操作记录和系统事件")
     public Result<Map<String, Object>> getRecentActivities(
+            @AuthUser SysUser user,
             @RequestParam(defaultValue = "10") Integer limit) {
         try {
-            Map<String, Object> activities = dashboardService.getRecentActivities(limit);
+            Map<String, Object> activities = dashboardService.getRecentActivities(user.getJobNumber(), limit);
             return Result.success(activities);
         } catch (Exception e) {
             log.error("获取最近活动失败", e);

+ 4 - 4
src/main/java/com/moka/gdtauto/controller/SysUserController.java

@@ -180,18 +180,18 @@ public class SysUserController {
     }
 
     /**
-     * 根据手机号查询用户
+     * 根据号查询用户
      * 
      * @param jobNumber 工号
      * @return 用户信息
      */
     @Operation(
-        summary = "根据手机号查询用户",
-        description = "通过手机号查询用户信息"
+        summary = "根据号查询用户",
+        description = "通过号查询用户信息"
     )
     @GetMapping("/by-job-number")
     public Result<UserVo> getUserByJobNumber(
-            @Parameter(description = "手机号", required = true, example = "13099999999")
+            @Parameter(description = "工号", required = true, example = "12358")
             @RequestParam String jobNumber) {
         try {
             SysUser user = sysUserService.getByJobNumber(jobNumber);

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

@@ -60,5 +60,5 @@ public interface DashboardService {
      * @param limit 限制数量
      * @return 最近活动Map
      */
-    Map<String, Object> getRecentActivities(Integer limit);
+    Map<String, Object> getRecentActivities(String jobNumber, Integer limit);
 }

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

@@ -188,8 +188,12 @@ public class AdPlanConfServiceImpl extends ServiceImpl<AdPlanConfMapper, AdPlanC
             try {
                 log.info("开始处理广告计划,planId={}, adgroupName={}", plan.getId(), plan.getAdgroupName());
                 
-                if (plan.getAdgroupId() > 0 || plan.getStatus() == AdPlanStatus.SUCCESS) 
-                    continue;
+                if (plan.getAdgroupId() > 0 || plan.getStatus() == AdPlanStatus.SUCCESS) {
+                     // 创建动态创意
+                createDynamicCreatives(plan, jobNumber, 33453856L);
+                continue;
+                }
+                    
 
                 // 更新状态为执行中
                 plan.setStatus(AdPlanStatus.IN_PROGRESS);
@@ -221,6 +225,7 @@ public class AdPlanConfServiceImpl extends ServiceImpl<AdPlanConfMapper, AdPlanC
 
                  // 更新状态为成功
                 plan.setStatus(AdPlanStatus.SUCCESS);
+                plan.setFailReason("");
                 plan.setSuccessTime(LocalDateTime.now());
                 adPlanService.updateById(plan);
                 
@@ -307,6 +312,7 @@ public class AdPlanConfServiceImpl extends ServiceImpl<AdPlanConfMapper, AdPlanC
                 // 更新创意ID和状态
                 creative.setCreativeId(response.getDynamicCreativeId());
                 creative.setStatus(AdPlanStatus.SUCCESS);
+                creative.setFailReason("");
                 creative.setSuccessTime(LocalDateTime.now());
                 adPlanCreativeService.updateById(creative);
                 
@@ -409,10 +415,11 @@ public class AdPlanConfServiceImpl extends ServiceImpl<AdPlanConfMapper, AdPlanC
         List<BrandComponent> brands = new ArrayList<>();
         
         BrandComponent brand = new BrandComponent();
-        BrandStruct brandValue = new BrandStruct();
-        brandValue.setBrandName("情感美文");
-        brandValue.setBrandImageId("30026044695");
-        brand.setValue(brandValue);
+        brand.setComponentId(44579024220L);
+        // BrandStruct brandValue = new BrandStruct();
+        // brandValue.setBrandName("情感美文");
+        // brandValue.setBrandImageId("30026044695");
+        // brand.setValue(brandValue);
         brands.add(brand);
         
         return brands;

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

@@ -255,13 +255,14 @@ public class DashboardServiceImpl implements DashboardService {
     }
 
     @Override
-    public Map<String, Object> getRecentActivities(Integer limit) {
+    public Map<String, Object> getRecentActivities(String jobNumber, Integer limit) {
         Map<String, Object> result = new HashMap<>();
         
         try {
             // 查询最近的广告计划配置执行情况
             LambdaQueryWrapper<AdPlanConf> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AdPlanConf::getDeleted, 0)
+                .eq(AdPlanConf::getJobNumber, jobNumber)
                     .orderByDesc(AdPlanConf::getUpdateTime)
                     .last("LIMIT " + Math.min(limit, 100)); // 最多查询100条
             

+ 1 - 0
src/test/java/com/moka/gdtauto/service/TencentAdsAdgroupCreateTest.java

@@ -340,6 +340,7 @@ class TencentAdsAdgroupCreateTest {
         brandValue.setBrandName("情感美女");
         brandValue.setBrandImageId("24319699712");
         brand.setValue(brandValue);
+        brand.setComponentId(44579024220L);
         brands.add(brand);
         components.setBrand(brands);