Browse Source

Merge remote-tracking branch 'origin/master'

songyh 4 years ago
parent
commit
3578043b9f

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

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface KuaishouProjectVideoGetMapper extends BaseMapper<KuaishouProjectVideoGet> {
 
-    void replaceBatch(@Param("list") List<KuaishouProjectVideoGet> list);
+    void replaceBatch(@Param("dataList") List<KuaishouProjectVideoGet> list);
 
     String queryLatestUpdateTime(@Param("projectId") Long projectId);
 

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

@@ -307,7 +307,7 @@
         WHERE t1.`status` =0
         AND t2.project_id=#{projectId}
         <if test="updateTime!=null and updateTime!=''">
-            AND t1.update_time &gt;=#{updateTime}
+            AND t1.update_time &gt; #{updateTime}
         </if>
         group by t1.signature
     </select>

File diff suppressed because it is too large
+ 87 - 96
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaishouProjectVideoGetMapper.xml


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

@@ -64,15 +64,15 @@ public class KuaishouProjectVideoGetServiceImpl extends ServiceImpl<KuaishouProj
     @Override
     public void clearProjectVideo(Long projectId, Integer pageNo, String updateTime) {
         try {
-            log.info("清洗快手项目素材数据,projectId:{},pageNo:{}", projectId, pageNo);
             if (Check.isNull(updateTime) && pageNo == 1) {
                 updateTime = projectVideoGetMapper.queryLatestUpdateTime(projectId);
             }
-            PageHelper.startPage(pageNo, 1500);
+            PageHelper.startPage(pageNo, 1500, false);
             List<KuaishouProjectVideoGet> list = videoGetMapper.selectProjectVideo(projectId, updateTime);
             if (Check.isNull(list)) {
                 return;
             }
+            log.info("清洗快手项目素材数据,projectId:{},pageNo:{},size:{}", projectId, pageNo, list.size());
             projectVideoGetMapper.replaceBatch(list);
             Thread.sleep(500);
             clearProjectVideo(projectId, pageNo + 1, updateTime);