|
|
@ -95,16 +95,13 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
|
|
|
|
begin = DateUtil.parse(DateUtil.format(begin, "yyyy-MM-dd"));
|
|
|
|
begin = DateUtil.parse(DateUtil.format(begin, "yyyy-MM-dd"));
|
|
|
|
end = DateUtil.parse(DateUtil.format(end, "yyyy-MM-dd"));
|
|
|
|
end = DateUtil.parse(DateUtil.format(end, "yyyy-MM-dd"));
|
|
|
|
long between = DateUtil.between(begin, end, DateUnit.DAY);
|
|
|
|
long between = DateUtil.between(begin, end, DateUnit.DAY);
|
|
|
|
if (between == 0) {
|
|
|
|
return between == 0;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public List<DmpMonitorJpaDto> getImeiNumJpa(String tableName, Date startDate, Date endDate, String tag) {
|
|
|
|
public List<DmpMonitorJpaDto> getImeiNumJpa(String tableName, Date startDate, Date endDate, String tag) {
|
|
|
|
StringBuilder sql = new StringBuilder();
|
|
|
|
StringBuilder sql = new StringBuilder();
|
|
|
|
sql.append("select tb.gmt_create as gmtCreate ,tb.imei as imei from " + tableName + " as tb where 1=1");
|
|
|
|
sql.append("select DISTINCT tb.gmt_create as gmtCreate ,tb.imei as imei from " + tableName + " as tb where 1=1");
|
|
|
|
sql.append(" and tb.imei != :imei1 ");
|
|
|
|
sql.append(" and tb.imei != :imei1 ");
|
|
|
|
sql.append(" and tb.imei != :imei2 ");
|
|
|
|
sql.append(" and tb.imei != :imei2 ");
|
|
|
|
sql.append(" and tb.gmt_create >= :startDate ");
|
|
|
|
sql.append(" and tb.gmt_create >= :startDate ");
|
|
|
|