From 83496eec1365c867a6dbf0e24a546935f106ce0a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:33 +0800
Subject: [PATCH] screen-aqi 修改实施界面空指针异常Bug
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 64eee36..0691274 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -77,8 +77,6 @@
@Autowired
private SysDictDataService sysDictDataService;
- @Autowired
- private LogUtils logUtils;
@Autowired
private RedisTemplate redisTemplate;
@@ -140,7 +138,7 @@
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
- logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@Override
@@ -163,7 +161,7 @@
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
content.append("������������������").append(device.getName()).append(";").append("mac���").append(mac);
- logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
}
@Override
@@ -223,7 +221,7 @@
}
}
- logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
}
@Override
@@ -294,14 +292,9 @@
queryWrapper.eq("monitor_point_id", mpId);
}
- //���������������������
- if (name != null) {
- queryWrapper.like("name", name);
- }
-
- //mac������������
- if (mac != null) {
- queryWrapper.like("mac", mac);
+ //���������������mac������������
+ if (name != null && mac != null) {
+ queryWrapper.like("name", name).or().like("mac", mac);
}
//������������,������create_time������
--
Gitblit v1.8.0