Browse Source

Merge remote-tracking branch 'origin/master'

yumeng 4 năm trước cách đây
mục cha
commit
328308c3c8

+ 4 - 1
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmEventSendServiceImpl.java

@@ -111,6 +111,8 @@ public class AlarmEventSendServiceImpl extends ServiceImpl<AlarmEventSendMapper,
 
     @Override
     public void matchAlarmRules(String checkType) {
+        log.info("------匹配规则start----------");
+        long startTime = System.currentTimeMillis();
         List<AlarmEventRule> allRules = getAllAlarmRules(checkType);
         List<JSONObject> accountCosts = getCostInfo("ACCOUNT");
         List<JSONObject> campaignCosts = getCostInfo("CAMPAIGN");
@@ -158,6 +160,8 @@ public class AlarmEventSendServiceImpl extends ServiceImpl<AlarmEventSendMapper,
                 }
             }
         }
+        long endTime = System.currentTimeMillis();
+        log.info("---end---匹配规则用时:{} ms", endTime - startTime);
     }
 
     /**
@@ -286,7 +290,6 @@ public class AlarmEventSendServiceImpl extends ServiceImpl<AlarmEventSendMapper,
         } catch (Exception e) {
             log.error("匹配规则异常", e);
         }
-
     }
 
     private boolean shutDown(AlarmEventRule rule, String level) {

+ 2 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/AlarmMetricValueServiceImpl.java

@@ -5,6 +5,7 @@ import cn.com.ctop.alarm.modules.mapper.AlarmMetricValueMapper;
 import cn.com.ctop.alarm.modules.service.IAlarmMetricValueService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,6 +23,7 @@ import java.util.Map;
  * @version V1.0
  * @date 2020-10-29
  */
+@Slf4j
 @Service
 public class AlarmMetricValueServiceImpl extends ServiceImpl<AlarmMetricValueMapper, AlarmMetricValue> implements IAlarmMetricValueService {
 

+ 6 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouCostGroupServiceImpl.java

@@ -10,6 +10,7 @@ import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportHourlyGroupMappe
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouCostGroupService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.db.DataSourceCachePool;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,7 @@ import java.util.Map;
  * @version V1.0
  * @date 2020-10-30
  */
+@Slf4j
 @Service
 public class KuaishouCostGroupServiceImpl extends ServiceImpl<KuaishouCostGroupMapper, KuaishouCostGroup> implements IKuaishouCostGroupService {
 
@@ -43,6 +45,8 @@ public class KuaishouCostGroupServiceImpl extends ServiceImpl<KuaishouCostGroupM
 
     @Override
     public void saveInfo() {
+        log.info("-----更新数据-start--------");
+        long startTime = System.currentTimeMillis();
         String date = DateUtils.getNowDate(DateUtils.WEB_FORMAT);
         Map<String, Object> deleteMap = new HashMap<>();
         deleteMap.put("stat_date", date);
@@ -71,6 +75,8 @@ public class KuaishouCostGroupServiceImpl extends ServiceImpl<KuaishouCostGroupM
 
         HashOperations<String, Object, Object> hash = DataSourceCachePool.getRedisTemplate().opsForHash();
         hash.putAll("KS_COST", map);
+        long endTime = System.currentTimeMillis();
+        log.info("---end---更新数据用时:{} ms", endTime - startTime);
     }
 
     /**

+ 6 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouZombieCreativeServiceImpl.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.enums.NoEn;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,7 @@ import java.util.Map;
  * @version V1.0
  * @date 2020-10-14
  */
+@Slf4j
 @Service
 public class KuaishouZombieCreativeServiceImpl extends ServiceImpl<KuaishouZombieCreativeMapper, KuaishouZombieCreative> implements IKuaishouZombieCreativeService {
     @Autowired
@@ -76,6 +78,8 @@ public class KuaishouZombieCreativeServiceImpl extends ServiceImpl<KuaishouZombi
 
     @Override
     public void checkZombieProject() {
+        log.info("-----------------start---------------");
+        long startTime = System.currentTimeMillis();
         //获取五天前的日期 yyyy-MM-dd
         String date = DateUtils.getLastDay(DateUtils.formatDate(new Date()), NoEn.NO5.valueInt());
         //查询五天内花费都为0的数据集
@@ -147,6 +151,8 @@ public class KuaishouZombieCreativeServiceImpl extends ServiceImpl<KuaishouZombi
         } else {
             insertorUpdate(list);
         }
+        long endTime = System.currentTimeMillis();
+        log.info("---end---僵尸计划判断用时:{} ms", endTime - startTime);
     }
 
     /**

+ 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}%')