From 1cc868492b79774b8103ce5589fbe6a2c7ad1fd9 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 04 May 2018 15:15:18 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 160 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 132 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index e8c755f..58b7dc2 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -10,10 +10,14 @@
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.bean.PageResult;
+import com.moral.common.exception.BusinessException;
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;
+import org.apache.log4j.Logger;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -28,10 +32,26 @@
@Service
public class DeviceServiceImpl implements DeviceService {
-
+ Logger log = Logger.getLogger(DeviceServiceImpl.class);
+ //-----------------------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
+ private MonitorPointMapper monitorPointMapper;
@Resource
private AccountService accountService;
private Class ENTITY_CLASS = Device.class;
@@ -98,11 +118,39 @@
@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);
}
/**
@@ -164,17 +212,22 @@
private void loadDeviceState(List<Device> list){
//���redis������������
list.stream().map( device -> {
- String state = getSateFromRedis(device.getMonitorPointId(),device.getMac());
- device.setState(state);
+ String mac = device.getMac();
+ if(!StringUtils.isBlank(mac)){
+ String state = getSateFromRedis(device.getMonitorPointId(),mac.toLowerCase());
+ device.setState(state);
+ }else{
+ device.setState(Constants.DEVICE_STATE_OFFLINE);
+ }
return device;
}).count();
}
private String getSateFromRedis(Integer mpId,String mac){
- Map<String,String> states = getStateMapFromRedis(mpId,mac);
+ Map<String,String> stateMap = getStateMapFromRedis(mpId,mac);
String state = null;
- if(states != null){
- state = states.get("state");
+ if(stateMap != null){
+ state = stateMap.get("state");
}
state = state == null ?Constants.DEVICE_STATE_OFFLINE:state;
return state;
@@ -196,10 +249,39 @@
}
return device;
}
-
+ /*
+ ������ redis ���������������
+ */
+ private void refreshDeviceInRedis(Device device){
+ if(!StringUtils.isBlank(device.getMac())){
+ 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());// ������������
+ 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) {
+ public int countByExample(PageBean pageBean){
Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+ addDeletesToExample(example);
+ return deviceMapper.selectCountByExample(example);
+ }
+
+ /**
+ * ������������������������
+ * @param example
+ */
+ private void addDeletesToExample(Example example){
List<Example.Criteria> criteriaList = example.getOredCriteria();
if(criteriaList!=null&&criteriaList.size()>0){
for(Example.Criteria cri : criteriaList){
@@ -208,6 +290,11 @@
}else {
example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
}
+ }
+ @Override
+ public PageBean queryByPageBean(PageBean pageBean) {
+ Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+ addDeletesToExample(example);
if(pageBean.getPageSize()>0){
PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
}
@@ -235,18 +322,32 @@
@Override
public void addOrModify(Device device){
try{
+ //mac ���������
+ if(StringUtils.isBlank(device.getMac())){
+ device.setMac(device.getMac().toLowerCase());
+ }
if(device.getId()==null){
+ device.setState(Constants.DEVICE_STATE_OFFLINE);
device.setIsDelete(Constants.IS_DELETE_FALSE);
deviceMapper.insertSelective(device);
}else{
deviceMapper.updateByPrimaryKeySelective(device);
+ //������redis���������������
+ refreshDeviceInRedis(device);
}
}
catch (Exception ex){
throw ex;
}
}
-
+ @Override
+ public List<Map> countByTimes(Date start,Date end,String format){
+ if(start==null||end==null||StringUtils.isBlank(format)){
+ log.error("some params is null");
+ throw new BusinessException("some params is null");
+ }
+ return deviceMapper.countByTimes(start, end, format);
+ }
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
Device device = new Device();
@@ -263,22 +364,25 @@
@Override
public List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData) {
List<Map<String,String>> list = macList.stream().map(mac->{
- Device device = getDeviceWithOrgIdsByMac(mac);
Map<String,String> resultMap = new HashMap<>();
- Map<String,String> stateMap = getStateMapFromRedis(device.getMonitorPointId(),mac);
- if(!MapUtils.isEmpty(stateMap)){
- resultMap.putAll(stateMap);
- }else{
- resultMap.put("state",Constants.DEVICE_STATE_OFFLINE);
- }
- if(BooleanUtils.isTrue(withData)){
- String dataKey = "data_"+mac;
- Map<String,String> dataMap = redisUtils.get(dataKey,new TypeReference<Map<String,String>>(){});
- if(!MapUtils.isEmpty(dataMap)){
- resultMap.putAll(dataMap);
+ if(!StringUtils.isBlank(mac)){
+ mac = mac.toLowerCase();
+ Device device = getDeviceWithOrgIdsByMac(mac);
+ Map<String,String> stateMap = getStateMapFromRedis(device.getMonitorPointId(),mac);
+ if(!MapUtils.isEmpty(stateMap)){
+ resultMap.putAll(stateMap);
+ }else{
+ resultMap.put("state",Constants.DEVICE_STATE_OFFLINE);
+ resultMap.put("mac",mac);
}
- }else{
- resultMap.put("mac",mac);
+ //������data
+ if(BooleanUtils.isTrue(withData)){
+ String dataKey = "data_"+mac;
+ Map<String,String> dataMap = redisUtils.get(dataKey,new TypeReference<Map<String,String>>(){});
+ if(!MapUtils.isEmpty(dataMap)){
+ resultMap.putAll(dataMap);
+ }
+ }
}
return resultMap;
}).collect(Collectors.toList());
--
Gitblit v1.8.0