From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改,同步reids里的信息。数据字典功能添加

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index bb9406d..74b3571 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -12,6 +12,7 @@
 import com.moral.common.bean.PageResult;
 import com.moral.common.util.ExampleUtil;
 import com.moral.common.util.RedisUtils;
+import com.moral.mapper.MonitorPointMapper;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +33,8 @@
 
 	@Resource
 	private DeviceMapper deviceMapper;
-
+    @Resource
+    private MonitorPointMapper monitorPointMapper;
 	@Resource
 	private AccountService accountService;
     private Class ENTITY_CLASS = Device.class;
@@ -202,7 +204,24 @@
 		}
 		return device;
 	}
-
+	/*
+	  ������ redis ���������������
+	 */
+	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());
+             if(device.getMonitorPointId()!=null){
+                 List<Integer> orgIds = monitorPointMapper.selectOrganizationIds(device.getMonitorPointId());
+                 simpleDevice.setOrganizationIds(orgIds);
+             }
+             String key = "device_"+device.getMac();
+             redisUtils.set(key,simpleDevice);
+         }
+	}
 	@Override
 	public PageBean queryByPageBean(PageBean pageBean) {
 		Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
@@ -250,6 +269,8 @@
 				deviceMapper.insertSelective(device);
 			}else{
 				deviceMapper.updateByPrimaryKeySelective(device);
+				//������redis���������������
+				refreshDeviceInRedis(device);
 			}
 		}
 		catch (Exception ex){

--
Gitblit v1.8.0