|
@ -38,7 +38,7 @@ public class RootLogServiceImpl implements RootLogService { |
|
|
String begin_time = (String) whereJson.get("begin_time"); |
|
|
String begin_time = (String) whereJson.get("begin_time"); |
|
|
String end_time = (String) whereJson.get("end_time"); |
|
|
String end_time = (String) whereJson.get("end_time"); |
|
|
|
|
|
|
|
|
Query query = new Query().with(Sort.by("date")); |
|
|
Query query = new Query().with(Sort.by(Sort.Order.desc("date"))); |
|
|
|
|
|
|
|
|
if (StrUtil.isEmpty(log_type)) { |
|
|
if (StrUtil.isEmpty(log_type)) { |
|
|
log_type = "default"; |
|
|
log_type = "default"; |
|
@ -82,7 +82,7 @@ public class RootLogServiceImpl implements RootLogService { |
|
|
device_code = json.getString("device_code"); |
|
|
device_code = json.getString("device_code"); |
|
|
} |
|
|
} |
|
|
if (StrUtil.isNotEmpty(begin_time) && StrUtil.isNotEmpty(end_time)) { |
|
|
if (StrUtil.isNotEmpty(begin_time) && StrUtil.isNotEmpty(end_time)) { |
|
|
query.addCriteria(Criteria.where("date") |
|
|
query.addCriteria(Criteria.where("create_time") |
|
|
.gte(begin_time) |
|
|
.gte(begin_time) |
|
|
.lte(end_time)); |
|
|
.lte(end_time)); |
|
|
} |
|
|
} |
|
|