设备 redis 同步完善

fengxiang

2018-05-11 fd13d232df7292d93172d1200235a77f286f64ed

 src/main/java/com/moral/controller/ScreenController.java

@@ -7,16 +7,13 @@
import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.io.InputStreamReader;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.*;

import java.util.stream.Collectors;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.moral.entity.alarm.AlarmConfig;

import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.net.ftp.FTPClient;

import org.apache.log4j.Logger;

@@ -24,6 +21,7 @@
import org.dom4j.Element;

import org.dom4j.io.SAXReader;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.cglib.beans.BeanMap;

import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.util.ObjectUtils;

@@ -157,17 +155,52 @@
    * @return the alarm levels

    */

   @GetMapping("alarm-levels")

   public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {

   public Object getAlarmLevels(HttpServletRequest request, Optional<Integer> orgId, Optional<Integer> mpId) {

        List<Map<String,Object>> sensorAlarmList = null;

      try {

         AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();

         Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();

         sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {

             AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);

            JSONObject alarmSensorLevelMap = (JSONObject) JSON.toJSON(alarmSensorLevel);

            alarmSensorLevelMap.put("key",key);

            return alarmSensorLevelMap;

         }).collect(Collectors.toList());

       try {

            AlarmConfig alarmConfig = null;

             if(orgId.isPresent()){

                 alarmConfig = alarmConfigService.queryValueByOrganizationId(orgId.get()).get();

             }else if(mpId.isPresent()){

                 alarmConfig = alarmConfigService.queryByMonitorPointId(mpId.get()).get();

             }

             //返回值处理

             if(alarmConfig.getValue()!=null&&alarmConfig.getValue().getAlarmLevels()!=null){

                 Map<String, AlarmSensorLevel> alarmLevelMap = alarmConfig.getValue().getAlarmLevels();

                 // 当前非取默认值，未设值将用默认值覆盖

                 Map<String,AlarmSensorLevel> defaultSensorLevelMap = null;

                 if(alarmConfig.getId()!=null){

                     AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue();

                     defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels();

                 }

                 Map<String, AlarmSensorLevel> finalDefaultSensorLevelMap = defaultSensorLevelMap;

                 alarmLevelMap.entrySet().stream().forEach(entry -> {

                     //当 increment都为0时，替换为默认值

                     AlarmSensorLevel alarmSensorLevel = entry.getValue();

                     if(alarmSensorLevel.getIncrement()!=null){

                         boolean isAllZero = alarmSensorLevel.getIncrement().stream().allMatch(item ->  item == 0);

                         if(isAllZero){

                             AlarmSensorLevel defaultAlarmSensorLevel = finalDefaultSensorLevelMap==null?null:finalDefaultSensorLevelMap.get(entry.getKey());

                             if(defaultAlarmSensorLevel!=null){

                                 alarmSensorLevel.setIncrement(defaultAlarmSensorLevel.getIncrement());

                             }else{

                                 List<Float> tempList = Arrays.asList(0.0f,200.0f,500.0f);

                                 alarmSensorLevel.setIncrement(tempList);

                             }

                         }

                     }

                 });

                 //map to list

                 Map<String, AlarmSensorLevel> finalAlarmLevelMap = alarmLevelMap;

                 sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {

                     AlarmSensorLevel alarmSensorLevel = finalAlarmLevelMap.get(key);

                     Map<String,Object> alarmSensorLevelMap = new HashMap<>(BeanMap.create(alarmSensorLevel));

                     alarmSensorLevelMap.put("key",key);

                     return alarmSensorLevelMap;

                 }).collect(Collectors.toList());

             }else{

                 return  new ResultBean<>("提供参数有误，未查询到任何数据",ResultBean.FAIL);

             }

      } catch (Exception e) {

         e.printStackTrace();

         Map<String, Object> err = new LinkedHashMap<String, Object>();