root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新设备

Browse Source
This commit is contained in:
gengby
2022-07-05 14:31:48 +08:00
parent 34f4f08218
commit eb5d4feec6
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wcs/hd/nladmin-system/src/main/java/org/nl/modules/log/service/impl/RootLogServiceImpl.java
View File

@@ -43,6 +43,7 @@ public class RootLogServiceImpl implements RootLogService {
if (StrUtil.isEmpty(log_type)) {
log_type = "default";
}
if (StrUtil.isNotEmpty(log_level)){
query.addCriteria(Criteria.where("level").is(log_level));
}
@@ -72,6 +73,8 @@ public class RootLogServiceImpl implements RootLogService {
String device_code = (String) whereJson.get("device_code");
String begin_time = (String) whereJson.get("begin_time");
String end_time = (String) whereJson.get("end_time");
String error_info = (String) whereJson.get("error_info");
Query query = new Query();
query.with(Sort.by(Sort.Order.desc("create_time")));
@@ -81,6 +84,9 @@ public class RootLogServiceImpl implements RootLogService {
JSONObject json = array.getJSONObject(0);
device_code = json.getString("device_code");
}
if (StrUtil.isNotEmpty(error_info)){
query.addCriteria(Criteria.where("message").regex(error_info));
}
if (StrUtil.isNotEmpty(begin_time) && StrUtil.isNotEmpty(end_time)) {
query.addCriteria(Criteria.where("create_time")
.gte(begin_time)