|
|
|
@ -97,7 +97,8 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
for (int i = 0; i <= betweenDay; i++) {
|
|
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
|
|
|
Date dateTime = DateUtil.offsetDay(beginTime, i);
|
|
|
|
|
List<DmpMonitorJpaDto> collect = iemi.stream().filter(c -> betweenByDay(dateTime, c.getGmtCreate())).collect(Collectors.toList());
|
|
|
|
|
List<DmpMonitorJpaDto> collect = iemi.stream().filter
|
|
|
|
|
(c -> betweenByDay(dateTime,DateUtil.parseDate(c.getGmtCreate()))).collect(Collectors.toList());
|
|
|
|
|
map.put("date", dateTime);
|
|
|
|
|
map.put("num", collect.size());
|
|
|
|
|
list.add(map);
|
|
|
|
@ -119,9 +120,10 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
sql.append("select DISTINCT DATE_FORMAT( tb.gmt_create, '%Y-%m-%d' ) as gmtCreate ,tb.imei as imei from " + tableName + " as tb where");
|
|
|
|
|
sql.append(" tb.imei != :imei1 ");
|
|
|
|
|
sql.append(" and tb.imei != :imei2 ");
|
|
|
|
|
sql.append(" and tb.gmt_create >= :startDate ");
|
|
|
|
|
sql.append(" and tb.gmt_create > :startDate ");
|
|
|
|
|
sql.append(" and tb.gmt_create < :endDate ");
|
|
|
|
|
sql.append(" and tb.tag = :tag ");
|
|
|
|
|
|
|
|
|
|
Query query = entityManager.createNativeQuery(sql.toString());
|
|
|
|
|
query.setParameter("imei1", "");
|
|
|
|
|
query.setParameter("imei2", "__IMEI__");
|
|
|
|
@ -138,8 +140,8 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
|
for (Object obj : list) {
|
|
|
|
|
Map row = (Map) obj;
|
|
|
|
|
DmpMonitorJpaDto trade = new DmpMonitorJpaDto();
|
|
|
|
|
trade.setImei((String) row.get("imei"));
|
|
|
|
|
trade.setGmtCreate((Date) row.get("gmtCreate"));
|
|
|
|
|
trade.setImei(row.get("imei").toString());
|
|
|
|
|
trade.setGmtCreate(row.get("gmtCreate").toString());
|
|
|
|
|
tradeList.add(trade);
|
|
|
|
|
}
|
|
|
|
|
return tradeList;
|
|
|
|
|