pudongliang 4 месяцев назад
Родитель
Сommit
97bf9333ac

+ 14 - 0
.vscode/settings.json

@@ -2,6 +2,20 @@
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.compile.nullAnalysis.mode": "automatic",
     "cSpell.enabled": false,
+    // 保存时自动组织导入(删除未使用的import + 排序)
+    "java.saveActions.organizeImports": true,
+    // 在变量视图中显示对象的toString()结果
+    "java.debug.settings.showToString": true,
+    // 显示静态变量
+    "java.debug.settings.showStaticVariables": true,
+    // 字符串最大显示长度(默认100,可增大)
+    "java.debug.settings.maxStringLength": 1000,
+    // 数组显示的最大元素数量
+    "java.debug.settings.showHex": false,
+    // 自动导入配置
+    "java.autobuild.enabled": true,
+    // 导入顺序(可选,自定义导入顺序)
+    "java.completion.importOrder": ["java", "javax", "org", "com", ""],
     // 搜索时排除的文件夹
     "search.exclude": {
         "**/target": true,

+ 5 - 3
src/main/java/com/moka/gdtauto/entity/AdAutoExecuteLog.java

@@ -1,15 +1,16 @@
 package com.moka.gdtauto.entity;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 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 java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 广告规则执行日志表
@@ -31,6 +32,7 @@ public class AdAutoExecuteLog implements Serializable {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
+    private String logType;
     private Long parentLogId;
 
     /**

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

@@ -1,5 +1,15 @@
 package com.moka.gdtauto.service;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,17 +23,6 @@ import com.tencent.ads.model.v3.ConfiguredStatus;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
 /**
  * 广告巡检执行器
  * 根据 AdAutoConf 配置的规则,对广告进行巡检并执行暂停操作
@@ -57,6 +56,7 @@ public class AdPlanAutoExecutor {
         executeLog.setParentLogId(0L);
         executeLog.setAdPlanConfId(0L);
         executeLog.setExecuteTime(LocalDateTime.now());
+        executeLog.setLogType("日预算");
         adAutoExecuteLogService.save(executeLog);
 
         try {

+ 10 - 10
src/main/java/com/moka/gdtauto/service/AdPlanCreativeAutoExecutor.java

@@ -1,12 +1,20 @@
 package com.moka.gdtauto.service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moka.gdtauto.common.AutoPlanRule;
 import com.moka.gdtauto.entity.AdAutoConf;
 import com.moka.gdtauto.entity.AdAutoExecuteLog;
-import com.moka.gdtauto.entity.AdPlan;
 import com.moka.gdtauto.entity.AdPlanConf;
 import com.moka.gdtauto.entity.AdPlanCreative;
 import com.tencent.ads.model.v3.ConfiguredStatus;
@@ -14,15 +22,6 @@ import com.tencent.ads.model.v3.ConfiguredStatus;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 /**
  * 广告巡检执行器
  * 根据 AdAutoConf 配置的规则,对广告进行巡检并执行暂停操作
@@ -53,6 +52,7 @@ public class AdPlanCreativeAutoExecutor {
         // 0. 创建执行日志
         AdAutoExecuteLog executeLog = new AdAutoExecuteLog();
         executeLog.setConfId(conf.getId());
+        executeLog.setLogType("创意巡检");
         executeLog.setParentLogId(0L);
         executeLog.setAdPlanConfId(0L);
         executeLog.setExecuteTime(LocalDateTime.now());

+ 5 - 17
src/main/java/com/moka/gdtauto/task/SyncAdgroupSystemStatusTask.java

@@ -1,27 +1,14 @@
 package com.moka.gdtauto.task;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.moka.gdtauto.common.Constant;
-import com.moka.gdtauto.client.TencentAdsApiClientFactory;
-import com.moka.gdtauto.entity.AdPlan;
-import com.moka.gdtauto.mapper.AdPlanMapper;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
 import com.moka.gdtauto.service.AdPlanCreativeService;
 import com.moka.gdtauto.service.AdPlanService;
-import com.tencent.ads.model.v3.AdgroupsGetListStruct;
-import com.tencent.ads.model.v3.AdgroupsGetResponseData;
-import com.tencent.ads.model.v3.FilterOperator;
-import com.tencent.ads.model.v3.FilteringStruct;
-import com.tencent.ads.v3.TencentAds;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 同步广告计划 system_status 定时任务
@@ -43,6 +30,7 @@ public class SyncAdgroupSystemStatusTask {
 
     private final AdPlanService adPlanService;
     private final AdPlanCreativeService adPlanCreativeService;
+
     /**
      * 每小时同步一次广告状态
      */