修改逻辑

master
ninftao 1 year ago
parent 2caff535fb
commit cdb59a25b3

@ -30,11 +30,11 @@ public interface BackDataEntityService {
* *
* @param imeiFirst * @param imeiFirst
* @param imeiSecond * @param imeiSecond
* @param date * @param startDate
* @param offsetMinute * @param endDate
* @param tagStr * @param tagStr
* @param value * @param value
* @return * @return
*/ */
List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime offsetMinute, DateTime date, List<String> tagStr, Integer value); List<PlateFormDTO> queryNewPlateFormDTO(String imeiFirst, String imeiSecond, DateTime startDate, DateTime endDate, List<String> tagStr, Integer value);
} }

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

Loading…
Cancel
Save