From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +0800
Subject: [PATCH] 地图点击关闭弹窗
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 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 3b53edd..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;
@@ -205,8 +207,20 @@
/*
������ redis ���������������
*/
- private void refreshDeviceInRedis(String mac){
- getDeviceWithOrgIdsByMac(mac);
+ 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) {
@@ -256,7 +270,7 @@
}else{
deviceMapper.updateByPrimaryKeySelective(device);
//������redis���������������
- refreshDeviceInRedis(device.getMac());
+ refreshDeviceInRedis(device);
}
}
catch (Exception ex){
--
Gitblit v1.8.0