From cdd72249b457b83e425584c3fd9bdf82577179ea Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 09 May 2018 14:10:03 +0800
Subject: [PATCH] 三级警报 优化
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 58b7dc2..d68aa2e 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -104,6 +104,8 @@
device.setId(queryDevice.getId());
deviceMapper.updateByPrimaryKeySelective(device);
}
+ //������redis������������
+ refreshDeviceInRedis(device);
}
@Override
@@ -111,21 +113,36 @@
ValidateUtil.notNull(uid, "param.is.null");
Device device = new Device();
device.setOperateUserId(uid);
- PageHelper.startPage(pageIndex, pageSize);
+ PageHelper.startPage(pageIndex, pageSize,false);
List<Device> devices = deviceMapper.select(device);
return devices;
}
+ @Override
+ public Device getDeviceByMac (String mac ,boolean fromCache){
+ if(fromCache){
+ Device device = getDeviceFromRedis(mac);
+ if(device==null) {
+ device = deviceMapper.selectWithOrgIdsByMac(mac);
+ if(device!=null){
+ setDeviceToRedis(mac,device);
+ }
+ }
+ return device;
+ }else {
+ return deviceMapper.selectWithOrgIdsByMac(mac);
+ }
+ }
+
+ /**
+ * ���������������������
+ * @param mac
+ * @return
+ */
@Override
public Device getDeviceByMac(String mac) {
- Device device = getDeviceFromRedis(mac);
- if(device==null) {
- device = deviceMapper.selectWithOrgIdsByMac(mac);
- if(device!=null){
- setDeviceToRedis(mac,device);
- }
- }
- return device;
+
+ return getDeviceByMac(mac,true);
}
/*
* ���������������������redis������key
@@ -388,4 +405,10 @@
}).collect(Collectors.toList());
return list;
}
+
+ @Override
+ public Device queryById(Integer id) {
+ return deviceMapper.selectByPrimaryKey(id);
+ }
+
}
--
Gitblit v1.8.0