From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 74b3571..1e2499b 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -210,10 +210,13 @@
private void refreshDeviceInRedis(Device device){
if(!StringUtils.isBlank(device.getMac())){
Device simpleDevice = new Device();
- simpleDevice.setId(device.getId());
- simpleDevice.setDeviceVersion(device.getDeviceVersion());
- simpleDevice.setMac(device.getMac());
- simpleDevice.setMonitorPointId(device.getMonitorPointId());
+ 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());
simpleDevice.setOrganizationIds(orgIds);
--
Gitblit v1.8.0