瀏覽代碼

修改素材池清洗项目素材

zhaoxian 4 年之前
父節點
當前提交
38de37be50

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouProjectVideoGetJob.java

@@ -33,7 +33,7 @@ public class KuaishouProjectVideoGetJob {
         //2快手,1开启的项目
         List<Project> projects = projectService.listByMediaType(2, 0);
         projects.forEach(project -> executorService.submit(() -> {
-            projectVideoGetService.clearProjectVideo(project.getId());
+            projectVideoGetService.clearProjectVideo(project.getId(),1);
         }));
         XxlJobHelper.log("清洗项目素材完成");
     }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouProjectVideoGetController.java

@@ -241,7 +241,7 @@ public class KuaishouProjectVideoGetController {
     @GetMapping(value = "/clearProjectVideo")
     public Result<Object> clearProjectVideo(Long projectId) {
         try {
-            kuaishouProjectVideoGetService.clearProjectVideo(projectId);
+            kuaishouProjectVideoGetService.clearProjectVideo(projectId,1);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

+ 6 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaishouProjectVideoGet.java

@@ -76,6 +76,7 @@ public class KuaishouProjectVideoGet {
     @Excel(name = "1 竖版视频 2 横版视频", width = 15)
     @ApiModelProperty(value = "1 竖版视频 2 横版视频")
     private Integer materialType;
+
     /**
      * 0:自产 1:素造
      */
@@ -107,6 +108,11 @@ public class KuaishouProjectVideoGet {
      * 允许投放结束时间
      */
     private String putEndTime;
+    private String supplierAccountName;
+    private Long supplierAccountId;
+
+    private String materialTag;
+
     /**
      * 创建时间
      */

+ 4 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoGetMapper.xml

@@ -298,7 +298,10 @@
         t1.stat_date,
         t1.signature,
         t1.photo_name,
-        t1.update_time
+        t1.update_time,
+        material_tag,
+        supplier_account_id,
+        supplier_account_name
         FROM ctop_kuaishou_video_get t1
         INNER JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
         WHERE t1.`status` =0

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouProjectVideoGetMapper.xml

@@ -36,7 +36,7 @@
             #{video.statDate},
             #{video.signature},
             #{video.photoName},
-            #{video.updateTime}
+            #{video.updateTime},
             #{video.materialTag},
             #{video.supplierAccountId},
             #{video.supplierAccountName}

+ 5 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouProjectVideoGetService.java

@@ -17,17 +17,17 @@ public interface IKuaishouProjectVideoGetService extends IService<KuaishouProjec
     /**
      * 清洗项目数据
      */
-    void clearProjectVideo(Long projectId);
+    void clearProjectVideo(Long projectId, Integer pageStart);
 
-    Result<Object> queryPageList(KuaishouProjectVideoGet kuaishouProjectVideoGet,Integer pageNo,Integer pageSize);
+    Result<Object> queryPageList(KuaishouProjectVideoGet kuaishouProjectVideoGet, Integer pageNo, Integer pageSize);
 
     Result<Object> getVideoTotalNumber(Long projectId);
 
-    Result<Object> getVideoDetails(String signature,String id);
+    Result<Object> getVideoDetails(String signature, String id);
 
-    Result<Object> getAccountVideos(String signature,Long projectId,Integer pageNo,Integer pageSize);
+    Result<Object> getAccountVideos(String signature, Long projectId, Integer pageNo, Integer pageSize);
 
-    Result<Object> queryCreativeBySignature(List<String> photoIds,Long accountId, Integer pageNo, Integer pageSize);
+    Result<Object> queryCreativeBySignature(List<String> photoIds, Long accountId, Integer pageNo, Integer pageSize);
 
     void deleteCreativesByPhotoId(Object photoId);
 }

+ 14 - 7
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouProjectVideoGetServiceImpl.java

@@ -60,11 +60,18 @@ public class KuaishouProjectVideoGetServiceImpl extends ServiceImpl<KuaishouProj
     private IKuaiShouVideoGetService videoGetService;
 
     @Override
-    public void clearProjectVideo(Long projectId) {
-        String updateTime = projectVideoGetMapper.queryLatestUpdateTime(projectId);
-        List<KuaishouProjectVideoGet> list = videoGetMapper.selectProjectVideo(projectId, updateTime);
-        if (!Check.isNull(list)) {
+    public void clearProjectVideo(Long projectId, Integer pageStart) {
+        try {
+            String updateTime = projectVideoGetMapper.queryLatestUpdateTime(projectId);
+            PageHelper.startPage(pageStart, 1500);
+            List<KuaishouProjectVideoGet> list = videoGetMapper.selectProjectVideo(projectId, updateTime);
+            if (Check.isNull(list)) {
+                return;
+            }
             projectVideoGetMapper.replaceBatch(list);
+            clearProjectVideo(projectId, pageStart + 1);
+        } catch (Exception e) {
+            log.error("清洗项目数据异常",e);
         }
     }
 
@@ -111,10 +118,10 @@ public class KuaishouProjectVideoGetServiceImpl extends ServiceImpl<KuaishouProj
     }
 
     @Override
-    public Result<Object> queryCreativeBySignature(List<String> photoIds,Long accountId, Integer pageNo, Integer pageSize) {
-        Long total = kuaiShouCreativeMapper.queryCreativeByPhotoIdTotal(photoIds,accountId);
+    public Result<Object> queryCreativeBySignature(List<String> photoIds, Long accountId, Integer pageNo, Integer pageSize) {
+        Long total = kuaiShouCreativeMapper.queryCreativeByPhotoIdTotal(photoIds, accountId);
         PageHelper.startPage(pageNo, pageSize, false);
-        PageInfo<JSONObject> list = new PageInfo<>(kuaiShouCreativeMapper.queryCreativeByPhotoIds(photoIds,accountId));
+        PageInfo<JSONObject> list = new PageInfo<>(kuaiShouCreativeMapper.queryCreativeByPhotoIds(photoIds, accountId));
         list.setTotal(total);
         return Result.ok(list);