Prechádzať zdrojové kódy

快手 同步素材加入同步app选项

yumeng 4 rokov pred
rodič
commit
0398985c2b

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialUploadController.java

@@ -37,6 +37,7 @@ public class MaterialUploadController {
     public Map<String, Object> uploadAccount(@RequestBody JSONObject json) {
         Map<String, Object> returnMap = new HashMap<>();
         String mediaId = json.getString("mediaId");
+        Boolean shieldBackwardSwitch = json.getBoolean("shieldBackwardSwitch");
         JSONArray materialArray = json.getJSONArray("materialArray");
         JSONArray accountArray = json.getJSONArray("accountArray");
         try {
@@ -48,7 +49,7 @@ public class MaterialUploadController {
             }
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-            new Thread(() -> materialUploadService.uploadAccount(mediaId, materialArray, accountArray, sysUser.getId())).start();
+            new Thread(() -> materialUploadService.uploadAccount(mediaId, materialArray, accountArray, sysUser.getId(), shieldBackwardSwitch)).start();
             returnMap.put("success", true);
             returnMap.put("message", "开始上传文件");
             returnMap.put("code", 0);
@@ -59,4 +60,6 @@ public class MaterialUploadController {
         }
         return returnMap;
     }
+
+
 }

+ 0 - 64
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouDailyGroupReportLoadJob.java

@@ -1,64 +0,0 @@
-package org.jeecg.modules.ctop.job;
-
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyGroupService;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.DateUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * 获取广告组分天报表
- *
- * @author syh
- */
-@Slf4j
-public class KuaishouDailyGroupReportLoadJob implements Job {
-    @Autowired
-    private ICtopOauthTokenService tokenService;
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-    @Autowired
-    private IKuaishouReportDailyGroupService reportDailyGroupService;
-    static ExecutorService executorService = null;
-
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                Date getDate = DateUtils.addDay(new Date(), -1);
-                //1:查询当日数据
-                List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
-                if (null == tokens || tokens.size() <= 0) {
-                    log.info("定时获取快手数据异常:未获取到可用的token");
-                    return;
-                }
-
-                log.info("快手广告租报表同步完成");
-                executorService = Executors.newFixedThreadPool(3);
-                tokens.forEach(token -> {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            //获取广告组信息数据
-                            reportDailyGroupService.getAdvertiserGroupReportDaily(token, getDate, getDate);
-                        }
-                    });
-                });
-            }
-
-        };
-        thread.start();
-
-    }
-}

+ 1 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/IMaterialUploadService.java

@@ -11,6 +11,6 @@ public interface IMaterialUploadService {
      * @param materialArray
      * @param accountArray
      */
-    void uploadAccount(String mediaId, JSONArray materialArray, JSONArray accountArray,String userId);
+    void uploadAccount(String mediaId, JSONArray materialArray, JSONArray accountArray,String userId,Boolean shieldBackwardSwitch);
 
 }

+ 6 - 4
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -77,10 +77,10 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
      * @param accountArray
      */
     @Override
-    public void uploadAccount(String mediaId, JSONArray materialArray, JSONArray accountArray, String userId) {
+    public void uploadAccount(String mediaId, JSONArray materialArray, JSONArray accountArray, String userId, Boolean shieldBackwardSwitch) {
         try {
             if ("2".equals(mediaId) || "4".equals(mediaId)) {
-                this.kuaiShouUpload(mediaId, materialArray, accountArray, userId);
+                this.kuaiShouUpload(mediaId, materialArray, accountArray, userId, shieldBackwardSwitch);
             } else if ("1".equals(mediaId) || "3".equals(mediaId)) {
                 this.touTiaoUpload(mediaId, materialArray, accountArray, userId);
             }
@@ -138,7 +138,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     @Autowired
     private IKuaiShouAdvertiserBaseInfoService advertiserBaseInfoService;
 
-    private void kuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray, String userId) {
+    private void kuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray, String userId, Boolean shieldBackwardSwitch) {
         for (int j = 0; j < materialArray.size(); j++) {
             String materialId = materialArray.getString(j);
             MaterialInfo materialInfo = materialInfoMapper.selectById(materialId);
@@ -155,7 +155,9 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                 JSONObject requestJson = new JSONObject();
                 requestJson.put("file", resource);
                 requestJson.put("signature", materialInfo.getCode());
-
+                if (!Check.isNull(shieldBackwardSwitch)) {
+                    requestJson.put("shield_backward_switch", shieldBackwardSwitch);
+                }
                 QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
                 parameterQueryWrapper.eq("material_id", materialInfo.getCode());
                 parameterQueryWrapper.orderByDesc("create_time").last("limit 1");