From b98924dab9f433d152944f189e0a28edb09ed7e7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 16:40:43 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index f99bbcb..a3c7ea1 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -30,7 +30,21 @@
@Service
public class DeviceServiceImpl implements DeviceService {
-
+ //-----------------------redis key������-������---------------------------------
+ private static String AlARM = "alarm";//������������������key������
+ private static String ADJUST="adjust";//���������������key������
+ private static String DEVICE = "device";//������������������key������
+ private static String STATE = "state";//������������������key������
+ private static String DATA = "data";//������������������key������
+ //-----------------------redis key������-������---------------------------------
+ private String keysConnect(String... keys) {
+ StringBuilder key = new StringBuilder(keys[0]);
+ for(int i=1;i<keys.length;i++) {
+ key.append("_");
+ key.append(keys[i]);
+ }
+ return key.toString().toLowerCase();
+ }
@Resource
private DeviceMapper deviceMapper;
@Resource
@@ -101,12 +115,40 @@
@Override
public Device getDeviceByMac(String mac) {
- ValidateUtil.notEmpty(mac, "param.is.null");
- Device device = new Device();
- device.setMac(mac);
- device = deviceMapper.selectOne(device);
+ Device device = getDeviceFromRedis(mac);
+ if(device==null) {
+ device = deviceMapper.selectWithOrgIdsByMac(mac);
+ if(device!=null){
+ setDeviceToRedis(mac,device);
+ }
+ }
return device;
}
+ /*
+ * ���������������������redis������key
+ */
+ private String getDeviceKey(String mac) {
+ return keysConnect(DEVICE,mac);
+ }
+ /*
+ * ������������������redis��������� ������
+ */
+ private void setDeviceToRedis(String mac,Device device){
+ String key = getDeviceKey(mac);
+ 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());// ������������
+ redisUtils.set(key,simpleDevice);
+ }
+ private Device getDeviceFromRedis(String mac) {
+ String key = getDeviceKey(mac);
+ return redisUtils.get(key,Device.class);
+ }
/**
*
--
Gitblit v1.8.0