From 9d4cd7bb803ed6516e9f699d41d33032dfa9914e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:49:57 +0800
Subject: [PATCH] 获取监控站布局配置。监控站下无设备，返回数组。
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index e2873c2..9d5f219 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -13,6 +13,8 @@
import com.moral.common.exception.BusinessException;
import com.moral.common.util.ExampleUtil;
import com.moral.common.util.RedisUtils;
+import com.moral.entity.DeviceVersion;
+import com.moral.mapper.DeviceVersionMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.OrganizationMapper;
import org.apache.commons.collections.MapUtils;
@@ -58,6 +60,8 @@
private Class ENTITY_CLASS = Device.class;
@Resource
OrganizationMapper orgMapper;
+ @Resource
+ DeviceVersionMapper deviceVersionMapper;
@Resource
RedisUtils redisUtils;
@Override
@@ -173,6 +177,7 @@
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) {
@@ -310,15 +315,8 @@
*/
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);
+ Device device = deviceMapper.selectWithOrgIdsByMac(mac);
+ setDeviceToRedis(mac,device);
}else
{
log.warn("param mac is null in method [refreshDeviceInRedis]");
--
Gitblit v1.8.0