From be9fe39e90412b4b46c8348bea94d0edaa1b19ae Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 12 Nov 2018 16:55:32 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 345dceb..f24a2b9 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -139,9 +139,6 @@
Device device = getDeviceFromRedis(mac);
if(device==null) {
device = deviceMapper.selectWithOrgIdsByMac(mac);
- if(device!=null){
- setDeviceToRedis(mac,device);
- }
}
return device;
}else {
@@ -166,22 +163,22 @@
private String getDeviceKey(String mac) {
return keysConnect(DEVICE,mac);
}
- /*
- * ������������������redis��������� ������
- */
- private void setDeviceToRedis(String mac,Device device){
- String key = getDeviceKey(mac);
- Device simpleDevice = new Device();
- simpleDevice.setId(device.getId());// id
- simpleDevice.setName(device.getName());// name
- simpleDevice.setAddress(device.getAddress());// address
- simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
- simpleDevice.setMac(device.getMac()); // mac
- simpleDevice.setMonitorPointId(device.getMonitorPointId());// ���������id
- simpleDevice.setOrganizationIds(device.getOrganizationIds());// ������������
- simpleDevice.setDeviceVersion(device.getDeviceVersion());
- redisUtils.set(key,simpleDevice);
- }
+// /*
+// * ������������������redis��������� ������
+// */
+// private void setDeviceToRedis(String mac,Device device){
+// String key = getDeviceKey(mac);
+// Device simpleDevice = new Device();
+// simpleDevice.setId(device.getId());// id
+// simpleDevice.setName(device.getName());// name
+// simpleDevice.setAddress(device.getAddress());// address
+// simpleDevice.setDeviceVersionId(device.getDeviceVersionId());// version
+// simpleDevice.setMac(device.getMac()); // mac
+// simpleDevice.setMonitorPointId(device.getMonitorPointId());// ���������id
+// simpleDevice.setOrganizationIds(device.getOrganizationIds());// ������������
+// simpleDevice.setDeviceVersion(device.getDeviceVersion());
+// redisUtils.set(key,simpleDevice);
+// }
private Device getDeviceFromRedis(String mac) {
String key = getDeviceKey(mac);
return redisUtils.get(key,Device.class);
@@ -312,13 +309,13 @@
/**
* ������������������������������
- * ������ redis ���������������
+ * ������ redis ���������������,���������������������������������������������task������
* @param mac
*/
private void refreshDeviceInRedis(String mac){
if(!StringUtils.isBlank(mac)){
- Device device = deviceMapper.selectWithOrgIdsByMac(mac);
- setDeviceToRedis(mac,device);
+ String key = getDeviceKey(mac);
+ redisUtils.remove(key);
}else
{
log.warn("param mac is null in method [refreshDeviceInRedis]");
@@ -346,7 +343,7 @@
}
}
@Override
- public PageBean queryByPageBean(PageBean pageBean) {
+ public PageBean queryByPageBean(PageBean pageBean) {
Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
// addDeletesToExample(example);
if(pageBean.getPageSize()>0){
--
Gitblit v1.8.0