yumeng 4 rokov pred
rodič
commit
191d28b204

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

@@ -43,7 +43,7 @@ import java.util.Map;
 @Slf4j
 @Api(tags = "供应商水印")
 @RestController
-@RequestMapping("/a12/supplierWatermark")
+@RequestMapping("/ctop/supplierWatermark")
 public class SupplierWatermarkController {
     @Autowired
     private ISupplierWatermarkService supplierWatermarkService;

+ 10 - 5
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -115,6 +115,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             supplierWatermarkQueryWrapper.last("limit 1");
             SupplierWatermark one = supplierWatermarkService.getOne(supplierWatermarkQueryWrapper);
             if (!Check.isNull(one)) {
+                log.info("供应商水印已存在,videoCode:{}", videoSignature);
                 return;
             }
 
@@ -141,13 +142,18 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                         SupplierWatermark supplierWatermark = new SupplierWatermark();
                         supplierWatermark.setVideoSignature(videoSignature);
                         supplierWatermark.setWatermarkUrl("https://media-1301855440.cos.ap-chongqing.myqcloud.com" + url);
-                        supplierWatermarkService.save(supplierWatermark);
+                        boolean save = supplierWatermarkService.save(supplierWatermark);
+                        if (save) {
+                            log.info("供应商水印生成完毕,videoCode:{}", videoSignature);
+
+                        }
                     }
                 }
             };
             thread.start();
 
         } catch (Exception e) {
+            log.info("供应商水印生成异常,videoCode:{}", videoSignature);
             e.printStackTrace();
 
         }
@@ -539,13 +545,12 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             info.setCreateTime(new Date());
             info.setUpdateTime(new Date());
             info.setType(type);
-
             Project project = projectService.getById(projectId);
             if (!Check.isNull(project)) {
-                info.setSupplierCode(project.getSupplierCode());
+                if (!Check.isNull(project.getSupplierCode())) {
+                    info.setSupplierCode(project.getSupplierCode());
+                }
             }
-
-
             MaterialCutFrame cutFrame = materialCutFrameService.getCutFrameByCode(code);
             if (Check.isNull(cutFrame)) {
                 String videoUrl = URLDecoder.decode(info.getUrl()).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");

+ 19 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java

@@ -2239,4 +2239,23 @@ public class BatchController {
     }
 
 
+    @GetMapping(value = "/syncVideo")
+    public Result<Boolean> syncVideo(Long accountId) {
+        Result<Boolean> result = new Result<>();
+        try {
+            String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
+            String endDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, 1);
+            syncPullMaterialService.getSyncVideoList(accountId, nowDate, nowDate);
+            syncPullMaterialService.getSyncSuZaoList(accountId, nowDate, endDate);
+            Thread.sleep(5 * 1000L);
+            result.setSuccess(true);
+            result.setResult(true);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+
 }

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

@@ -2433,7 +2433,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     @Override
     public void getAppList(Long advertiserId, String accessToken) {
         try {
-            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.APP_LIST;
+            String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.APP_LIST_v2;
             Map<String, String> headers = new HashMap<>();
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", " application/json");