|
|
|
@ -82,7 +82,7 @@ public class BackDataEntityServiceImpl implements BackDataEntityService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime offsetMinute, DateTime date, List<String> tagStr, Integer value) {
|
|
|
|
|
public List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime startDate, DateTime endDate, List<String> tagStr, Integer value) {
|
|
|
|
|
|
|
|
|
|
List<PlateFormDTO> newFormDTOList = Lists.newArrayList();
|
|
|
|
|
switch (value) {
|
|
|
|
@ -90,35 +90,35 @@ public class BackDataEntityServiceImpl implements BackDataEntityService {
|
|
|
|
|
List<String> v1TagList = Lists.newArrayList();
|
|
|
|
|
List<String> v2TagList = Lists.newArrayList();
|
|
|
|
|
for (String tag : tagStr) {
|
|
|
|
|
((tag.lastIndexOf("v2") > 0) ? v1TagList : v2TagList).add(tag);
|
|
|
|
|
((tag.lastIndexOf("v2") > 0) ? v2TagList : v1TagList).add(tag);
|
|
|
|
|
}
|
|
|
|
|
// 巨量
|
|
|
|
|
if (!CollectionUtils.isEmpty(v1TagList)) {
|
|
|
|
|
newFormDTOList.addAll(jlv1BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, v1TagList));
|
|
|
|
|
newFormDTOList.addAll(jlv1BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, v1TagList));
|
|
|
|
|
}
|
|
|
|
|
if (!CollectionUtils.isEmpty(v2TagList)) {
|
|
|
|
|
newFormDTOList.addAll(jlv2BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, v2TagList));
|
|
|
|
|
newFormDTOList.addAll(jlv2BackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, v2TagList));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
// 快手
|
|
|
|
|
newFormDTOList = tbKSNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
|
|
|
|
|
newFormDTOList = tbKSNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
// UC
|
|
|
|
|
newFormDTOList = tbUcBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
|
|
|
|
|
newFormDTOList = tbUcBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
// VIVO
|
|
|
|
|
newFormDTOList = tbVivoBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
|
|
|
|
|
newFormDTOList = tbVivoBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
|
|
|
|
// 百度
|
|
|
|
|
newFormDTOList = tbBDNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr);
|
|
|
|
|
newFormDTOList = tbBDNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr);
|
|
|
|
|
break;
|
|
|
|
|
case 6:
|
|
|
|
|
// 广点通
|
|
|
|
|
newFormDTOList = tbGdtNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, date, offsetMinute, tagStr, "android");
|
|
|
|
|
newFormDTOList = tbGdtNewBackdataEntityRepository.queryPlateFormDTO(imeiFirst, imeiSecond, startDate, endDate, tagStr, "android");
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
}
|
|
|
|
|