|
|
|
@ -1,5 +1,6 @@
|
|
|
|
|
package com.baiyee.adcallback.service.impl;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.date.DateUnit;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.text.StrPool;
|
|
|
|
@ -100,17 +101,22 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
Date startTime = dmpMonitorNumDto.getStartTime();
|
|
|
|
|
Date endTime = dmpMonitorNumDto.getEndTime();
|
|
|
|
|
List<DmpMonitorJpaDto> listAll = new ArrayList<>();
|
|
|
|
|
if (jlArray.size() > 0) {
|
|
|
|
|
if (CollUtil.isNotEmpty(jlArray)) {
|
|
|
|
|
listAll.addAll(getImeiNumJpa(TableEnum.JL.getTableName(), startTime, endTime, jlArray, flag));
|
|
|
|
|
} else if (ksArray.size() > 0) {
|
|
|
|
|
}
|
|
|
|
|
if (CollUtil.isNotEmpty(ksArray)) {
|
|
|
|
|
listAll.addAll(getImeiNumJpa(TableEnum.KS.getTableName(), startTime, endTime, ksArray, flag));
|
|
|
|
|
} else if (ucArray.size() > 0) {
|
|
|
|
|
}
|
|
|
|
|
if (CollUtil.isNotEmpty(ucArray)) {
|
|
|
|
|
listAll.addAll(getImeiNumJpa(TableEnum.UC.getTableName(), startTime, endTime, ucArray, flag));
|
|
|
|
|
} else if (vvArray.size() > 0) {
|
|
|
|
|
}
|
|
|
|
|
if (CollUtil.isNotEmpty(vvArray)) {
|
|
|
|
|
listAll.addAll(getImeiNumJpa(TableEnum.VV.getTableName(), startTime, endTime, vvArray, flag));
|
|
|
|
|
} else if (bdArray.size() > 0) {
|
|
|
|
|
}
|
|
|
|
|
if (CollUtil.isNotEmpty(bdArray)) {
|
|
|
|
|
listAll.addAll(getImeiNumJpa(TableEnum.BD.getTableName(), startTime, endTime, bdArray, flag));
|
|
|
|
|
} else if (gdArray.size() > 0) {
|
|
|
|
|
}
|
|
|
|
|
if (CollUtil.isNotEmpty(gdArray)) {
|
|
|
|
|
listAll.addAll(getImeiNumJpa(TableEnum.GD.getTableName(), startTime, endTime, gdArray, flag));
|
|
|
|
|
}
|
|
|
|
|
return listAll;
|
|
|
|
|