|
|
|
@ -213,7 +213,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
sql.append(" and tb.gmt_create >= :startDate ");
|
|
|
|
|
sql.append(" and tb.gmt_create < :endDate ");
|
|
|
|
|
sql.append(" and tb.tag in :tag ");
|
|
|
|
|
sql.append(" group by tb.imei,tb.tag");
|
|
|
|
|
sql.append(" group by tb.imei,tb.tag,date");
|
|
|
|
|
}
|
|
|
|
|
return sql.toString();
|
|
|
|
|
}
|
|
|
|
@ -270,7 +270,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
sql.append(" and tb.gmt_create < :endDate ");
|
|
|
|
|
sql.append(" and tb.device_os_type = :deviceOsType ");
|
|
|
|
|
sql.append(" and tb.tag in :tag ");
|
|
|
|
|
sql.append(" group by tb.muid,tb.tag");
|
|
|
|
|
sql.append(" group by tb.muid,tb.tag,date");
|
|
|
|
|
}
|
|
|
|
|
return sql.toString();
|
|
|
|
|
}
|
|
|
|
@ -321,7 +321,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
// 返回数据
|
|
|
|
|
newDataList.addAll(monitorJpaDtoList);
|
|
|
|
|
}
|
|
|
|
|
log.error("================ the save datalist size as {} ================",saveDataList.size());
|
|
|
|
|
log.error("================ the save datalist size as {} ================", saveDataList.size());
|
|
|
|
|
if (CollUtil.isNotEmpty(saveDataList)) {
|
|
|
|
|
// 异步插入数据
|
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
@ -331,7 +331,7 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
tbDeliveryStatisticEntityRepository.saveAll(deliveryStatisticEntityList);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
log.error("================ the new datalist size as {} ================",newDataList.size());
|
|
|
|
|
log.error("================ the new datalist size as {} ================", newDataList.size());
|
|
|
|
|
return newDataList;
|
|
|
|
|
}
|
|
|
|
|
return tradeList;
|
|
|
|
|