From f600872a54da4b41ed137c3361f685604e47ee9d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 17:18:23 +0800
Subject: [PATCH] 编辑 设备 redis里组织id清空bug修复。
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index f6b20ef..53ef55d 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -105,7 +105,7 @@
deviceMapper.updateByPrimaryKeySelective(device);
}
//������redis������������
- refreshDeviceInRedis(device);
+ refreshDeviceInRedis(device.getMac());
}
@Override
@@ -273,26 +273,27 @@
}
return device;
}
- /*
- ������ redis ���������������
+
+ /**
+ * ������������������������������
+ * ������ redis ���������������
+ * @param mac
*/
- private void refreshDeviceInRedis(Device device){
- if(!StringUtils.isBlank(device.getMac())){
-// 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());// ������������
- if(device.getMonitorPointId()!=null){
- List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
- device.setOrganizationIds(orgIds);
- }
- String key = "device_"+device.getMac();
+ private void refreshDeviceInRedis(String mac){
+ if(!StringUtils.isBlank(mac)){
+ Device devQuery = new Device();
+ devQuery.setMac(mac);
+ Device device = deviceMapper.selectOne(devQuery);
+ if(device.getMonitorPointId()!=null){
+ List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
+ device.setOrganizationIds(orgIds);
+ }
+ String key = "device_"+mac;
redisUtils.set(key,device);
- }
+ }else
+ {
+ log.warn("param mac is null in method [refreshDeviceInRedis]");
+ }
}
@Override
public int countByExample(PageBean pageBean){
@@ -358,7 +359,7 @@
deviceMapper.updateByPrimaryKeySelective(device);
}
//������redis���������������
- refreshDeviceInRedis(device);
+ refreshDeviceInRedis(device.getMac());
}
catch (Exception ex){
throw ex;
--
Gitblit v1.8.0