|
|
|
@ -4,10 +4,8 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
|
import cn.hutool.core.date.DateUnit;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.text.CharSequenceUtil;
|
|
|
|
|
import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
|
|
|
|
|
import com.baiyee.adcallback.api.dto.DmpMonitorNumDto;
|
|
|
|
|
import com.baiyee.adcallback.common.constant.DataConstant;
|
|
|
|
|
import com.baiyee.adcallback.common.enums.DeliveryPlatformEnum;
|
|
|
|
|
import com.baiyee.adcallback.config.pojo.DeliveryStatisticDTO;
|
|
|
|
|
import com.baiyee.adcallback.repository.TbDeliveryStatisticEntityRepository;
|
|
|
|
@ -78,8 +76,9 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service {
|
|
|
|
|
private List<DmpMonitorJpaDto> getMapData(DmpMonitorNumDto dmpMonitorNumDto, Integer flag) {
|
|
|
|
|
Map<Integer, List<String>> talbeMap = Maps.newHashMap();
|
|
|
|
|
List<DmpMonitorJpaDto> voList = Lists.newArrayList();
|
|
|
|
|
Date startTime = dmpMonitorNumDto.getStartTime();
|
|
|
|
|
Integer type = dmpMonitorNumDto.getQueryType();
|
|
|
|
|
Date endTime = dmpMonitorNumDto.getEndTime();
|
|
|
|
|
Date startTime = dmpMonitorNumDto.getStartTime();
|
|
|
|
|
for (String tag : dmpMonitorNumDto.getTags()) {
|
|
|
|
|
for (DeliveryPlatformEnum value : DeliveryPlatformEnum.values()) {
|
|
|
|
|
if (tag.startsWith(value.getType().toLowerCase())) {
|
|
|
|
@ -101,37 +100,37 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service {
|
|
|
|
|
List<String> tagList = entry.getValue();
|
|
|
|
|
switch (index) {
|
|
|
|
|
case 1:
|
|
|
|
|
voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(jlV1BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
case 7:
|
|
|
|
|
// v2
|
|
|
|
|
voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(jlV2BackDataService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
// 快手
|
|
|
|
|
voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(ksBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
// UC
|
|
|
|
|
voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(ucBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
// VIVO
|
|
|
|
|
voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(vivoBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
|
|
|
|
//百度
|
|
|
|
|
voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(bdBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
case 6:
|
|
|
|
|
//广点通
|
|
|
|
|
voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag));
|
|
|
|
|
voList.addAll(gdtBackDateService.queryByTagAndTimeAndFlag(startTime, endTime, tagList, flag, type));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return flag == 1 ? voList : this.getDmpMonitorJpaDto(voList);
|
|
|
|
|
return flag == 1 ? voList : this.getDmpMonitorJpaDto(voList, type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -163,7 +162,7 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<DmpMonitorJpaDto> getDmpMonitorJpaDto(List<DmpMonitorJpaDto> list) {
|
|
|
|
|
private List<DmpMonitorJpaDto> getDmpMonitorJpaDto(List<DmpMonitorJpaDto> list, Integer type) {
|
|
|
|
|
List<DmpMonitorJpaDto> tradeList = new ArrayList<>();
|
|
|
|
|
Map<String, List<DmpMonitorJpaDto>> stringCollectionMap =
|
|
|
|
|
list.stream().collect(Collectors.groupingBy(DmpMonitorJpaDto::getTag));
|
|
|
|
@ -177,7 +176,7 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service {
|
|
|
|
|
// 转换set
|
|
|
|
|
Set<DeliveryStatisticDTO> rawDataSet = Convert.toSet(DeliveryStatisticDTO.class, dmpMonitorJpaDtoSet);
|
|
|
|
|
// 查询数据
|
|
|
|
|
List<DeliveryStatisticDTO> tagLists = Convert.toList(DeliveryStatisticDTO.class, tbDeliveryStatisticEntityRepository.findByTag(tagStr, 0));
|
|
|
|
|
List<DeliveryStatisticDTO> tagLists = Convert.toList(DeliveryStatisticDTO.class, tbDeliveryStatisticEntityRepository.findByTag(tagStr , type, 0));
|
|
|
|
|
|
|
|
|
|
Set<DeliveryStatisticDTO> newDataSet = Sets.newHashSet(tagLists);
|
|
|
|
|
// 差集去除数据
|
|
|
|
@ -194,6 +193,7 @@ public class DmpMonitorV2ServiceImpl implements DmpMonitorV2Service {
|
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
|
List<TbDeliveryStatisticEntity> deliveryStatisticEntityList = Convert.toList(TbDeliveryStatisticEntity.class, saveDataList);
|
|
|
|
|
// 批量保存
|
|
|
|
|
deliveryStatisticEntityList.forEach(item -> item.setType(type));
|
|
|
|
|
tbDeliveryStatisticEntityRepository.saveAll(deliveryStatisticEntityList);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|