Browse Source

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

zhaoxian 4 years ago
parent
commit
dffcc13f5d

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

@@ -1,5 +1,6 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.WarningOperationLog;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
@@ -66,8 +67,8 @@ public class WarningOperationServiceImpl implements IWarningOperationService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-       /* CtopOauthToken token = oauthTokenService.getTokenByAccountId(advertiserId);
-        updateService.updateUnitStatus(token.getAccessToken(), advertiserId, unitId, 2, "admin");*/
+        CtopOauthToken token = oauthTokenService.getTokenByAccountId(advertiserId);
+        updateService.updateUnitStatus(token.getAccessToken(), advertiserId, unitId, 2, "admin");
         WarningOperationLog warningOperationLog = new WarningOperationLog();
         warningOperationLog.setAccountId(advertiserId);
         warningOperationLog.setSubject("出价方式预警");
@@ -100,8 +101,8 @@ public class WarningOperationServiceImpl implements IWarningOperationService {
             e.printStackTrace();
         }
 
-        /*CtopOauthToken token = oauthTokenService.getTokenByAccountId(advertiserId);
-        updateService.updateUnitStatus(token.getAccessToken(), advertiserId, unitId, 2, "admin");*/
+        CtopOauthToken token = oauthTokenService.getTokenByAccountId(advertiserId);
+        updateService.updateUnitStatus(token.getAccessToken(), advertiserId, unitId, 2, "admin");
 
         WarningOperationLog warningOperationLog = new WarningOperationLog();
         warningOperationLog.setAccountId(advertiserId);

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceVideoReportMapper.xml

@@ -27,6 +27,7 @@
                 #{item}
             </foreach>
         </if>
+        AND t1.video_url is not null
         GROUP BY t1.signature
         ) t
         WHERE (t.clip LIKE '%${clip}%')