From 093a58b2b7df015c371daa1c1634ff8bfd8f003b Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 21 Mar 2018 10:12:27 +0800
Subject: [PATCH] 报表 优化
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 152970a..74b3571 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,12 +1,21 @@
package com.moral.service.impl;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.alibaba.fastjson.TypeReference;
+import com.github.pagehelper.Page;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
+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;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -24,10 +33,13 @@
@Resource
private DeviceMapper deviceMapper;
-
+ @Resource
+ private MonitorPointMapper monitorPointMapper;
@Resource
private AccountService accountService;
private Class ENTITY_CLASS = Device.class;
+ @Resource
+ RedisUtils redisUtils;
@Override
public Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
@@ -56,11 +68,6 @@
return result;
}
- @Override
- public List<Map<String, Object>> getSensorsByDevice(String mac) {
- return deviceMapper.getSensorsByDevice(mac);
- }
-
@Override
@Transactional
public void saveOrUpdateDevice(Device device) {
@@ -101,6 +108,120 @@
return device;
}
+ /**
+ *
+ * @param map
+ * map��� ������ ������id���4������������
+ * @return
+ */
+ @Override
+ public List<Device> query(Map<String, Object> map) {
+ List <Device> list = deviceMapper.selectByMap(map);
+ loadDeviceState(list);
+ return list;
+ }
+
+ /**
+ * ������������id��������������� ������������������
+ * @param orgId
+ * @param deviceName
+ * @param pageSize
+ * @param pageNo
+ * @return
+ */
+ @Override
+ public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {
+ if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
+ PageHelper.startPage(pageNo,pageSize);
+ }
+ List<Device> list = deviceMapper.selectByOrgIdAndDevName(orgId,deviceName);
+ //���redis������������
+ loadDeviceState(list);
+ if(list instanceof Page){
+ return new PageResult(((Page) list).getTotal(),list);
+ }
+ return new PageResult(null,list);
+ }
+
+ /**
+ * ������������id������������id ������������������
+ * @param orgId
+ * @param mpId
+ * @param pageSize
+ * @param pageNo
+ * @return
+ */
+ @Override
+ public PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo) {
+ if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
+ PageHelper.startPage(pageNo,pageSize);
+ }
+ List<Device> list = deviceMapper.selectByOrgIdAndMpId(orgId,mpId);
+ //���redis������������
+ loadDeviceState(list);
+ if(list instanceof Page){
+ return new PageResult(((Page) list).getTotal(),list);
+ }
+ return new PageResult(null,list);
+ }
+ private void loadDeviceState(List<Device> list){
+ //���redis������������
+ list.stream().map( device -> {
+ 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> stateMap = getStateMapFromRedis(mpId,mac);
+ String state = null;
+ if(stateMap != null){
+ state = stateMap.get("state");
+ }
+ state = state == null ?Constants.DEVICE_STATE_OFFLINE:state;
+ return state;
+ }
+ public Map<String,String> getStateMapFromRedis(Integer mpId,String mac){
+ StringBuilder key = new StringBuilder();
+ //������key
+ key.append("state_").append(mpId).append("_").append(mac);
+ return redisUtils.get(key.toString(),new TypeReference<Map<String,String>>(){});
+ }
+ private Device getDeviceWithOrgIdsByMac(String mac) {
+ String key = "device_"+mac;
+ Device device = redisUtils.get(key,Device.class);
+ if(device==null) {
+ device = deviceMapper.selectWithOrgIdsByMac(mac);
+ if(device!=null){
+ redisUtils.set(key,device);
+ }
+ }
+ 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);
@@ -139,11 +260,17 @@
@Override
public void addOrModify(Device device){
try{
+ //mac ���������
+ if(StringUtils.isBlank(device.getMac())){
+ device.setMac(device.getMac().toLowerCase());
+ }
if(device.getId()==null){
device.setIsDelete(Constants.IS_DELETE_FALSE);
deviceMapper.insertSelective(device);
}else{
deviceMapper.updateByPrimaryKeySelective(device);
+ //������redis���������������
+ refreshDeviceInRedis(device);
}
}
catch (Exception ex){
@@ -151,5 +278,44 @@
}
}
+ @Override
+ public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
+ Device device = new Device();
+ device.setMonitorPointId(monitorPointId);
+ device.setIsDelete(Constants.IS_DELETE_FALSE);
+ return deviceMapper.select(device);
+ }
+ /**
+ * ������map{mac������state���}
+ * @param macList
+ * @return
+ */
+ @Override
+ public List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData) {
+ List<Map<String,String>> list = macList.stream().map(mac->{
+ Map<String,String> resultMap = new HashMap<>();
+ 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);
+ }
+ //������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());
+ return list;
+ }
}
--
Gitblit v1.8.0