yumeng 4 rokov pred
rodič
commit
e1c957e71f

+ 21 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/MaterialRefuseController.java

@@ -3,10 +3,11 @@ package cn.com.ctop.kuaishou.modules.batch.controller;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
-import cn.com.ctop.kuaishou.modules.batch.service.IMaterialRefuseService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -28,13 +30,13 @@ import java.util.concurrent.Executors;
 @RequestMapping("/MaterialRefuse/")
 public class MaterialRefuseController {
     @Autowired
-    private IMaterialRefuseService materialRefuseService;
-    @Autowired
     private CtopOauthTokenMapper oauthTokenMapper;
     @Autowired
     private IKuaiShouUpdateService updateService;
     @Autowired
     private IKuaiShouCreativeService creativeService;
+    @Autowired
+    private IKuaiShouActionBarTextService actionBarTextService;
     static ExecutorService executorService = Executors.newFixedThreadPool(15);
 
 
@@ -61,6 +63,22 @@ public class MaterialRefuseController {
     }
 
 
+    @GetMapping(value = "getAllActionBarText")
+    public Result<List<KuaiShouActionBarText>> getAllActionBarText() {
+        Result<List<KuaiShouActionBarText>> result = new Result<>();
+        try {
+            //  QueryWrapper<KuaiShouActionBarText> actionBarTextQueryWrapper = new QueryWrapper<>();
+            List<KuaiShouActionBarText> list = actionBarTextService.list();
+            result.setResult(list);
+            result.setSuccess(true);
+        } catch (Exception e) {
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+        return result;
+    }
+
+
     @GetMapping(value = "syncCreative")
     public Result<Boolean> syncCreative(Long accountId, Long campaignId) {
         Result<Boolean> result = new Result<>();

+ 3 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreativeServiceImpl.java

@@ -86,7 +86,9 @@ public class KuaiShouCreativeServiceImpl extends ServiceImpl<KuaiShouCreativeMap
         headers.put("Access-Token", accessToken);
         JSONObject param = new JSONObject();
         param.put("advertiser_id", accountId);
-        param.put("campaign_id", campaignId);
+        if (!Check.isNull(campaignId)) {
+            param.put("campaign_id", campaignId);
+        }
         param.put("page_size", 200);
         param.put("page", page);