校准值

fengxiang

2017-11-14 2ddf896f0edfa33e5421a7e34018e2d8f93684e6

校准值

 src/main/java/com/moral/monitor/listener/TaskListener.java

@@ -56,7 +56,7 @@
    RedisService redisService;

    @Override

    public void onMessage(Message msg) {



        try {

        String message = null;

        try {

            message = new String(msg.getBody(), "utf-8");

@@ -121,6 +121,10 @@


        //mongoTemplate.insert(JSON.toJSONString(histories), "data");

        mongoTemplate.insert(new_message, "data");

        } catch (Exception e) {

             //打印错误

             logger.error(e.getMessage());

        }

    }

    //三级警报值阀值

    private static Map<String,Double[]> alarmLevles =new HashMap<String, Double[]>();

@@ -151,8 +155,9 @@
    //根据三级警报阀值，确定设备状态

    private int detEquState(Map<String,String> data) {

        int state = 0;

        data.remove("mac");//不需要存储mac地址

        Map<String, Object> equMap = new HashMap<String, Object>();

        String mac = data.get("mac");

        data.remove("mac");//不需要存储mac地址

        equMap.putAll(data);

        if(data!=null) {

                for(String key:alarmLevles.keySet()) {

@@ -182,7 +187,7 @@
                }

        }

        equMap.put("state", state);//设备状态  

        redisService.setEquState(data.get("mac"),equMap);

        redisService.setEquState(mac,equMap);

        return state;

    }

}


 src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONObject;

import com.alibaba.fastjson.TypeReference;

import com.moral.monitor.dao.JobDao;

import com.moral.monitor.service.RedisService;

@@ -38,6 +39,9 @@
        return "static_equ_"+mac;

    }

    public void setStaticEqu(String mac,Map<String,Object> equMap) {

         if(mac==null) {

             throw new RuntimeException("Value for mac cannot be null");

         }

         RedisUtil.set(redis, getStaticEquKey(mac),JSON.toJSONString(equMap));

    }

    public Map<String,Object> getStaticEqu(String mac) {

@@ -47,17 +51,17 @@
        if(StringUtils.isEmpty(staticEquJson)) {

             equMap = jobDao.findEquWithAdjustsByMac(mac);

             if(equMap!=null) {

                 //没有赋值的adjust，不储存

                 //list转map没有赋值的adjust，不储存,

                 List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);

                 List<Object> adjustListWithData = new ArrayList<Object>();

                 Map<String,String> adjustMap = new HashMap();

                 //list to map

                 for(Map<String,Object> adjust:adjustList) {

                     if(adjust.get("value")!=null) {

                     if(adjust.get("value")!=null&&Float.parseFloat(adjust.get("value").toString())!=0.0) {

                         //没有值的清空

                         adjustListWithData.add(adjust);

                         adjustMap.put(adjust.get("key").toString(), adjust.get("value").toString());

                     }

                 }

                 equMap.put(ADJUSTS,adjustListWithData);

                equMap.put(ADJUSTS,adjustMap);

                  setStaticEqu(mac,equMap);

             }

        }else {

@@ -70,18 +74,10 @@
     */

    public Map<String,Float> getAdjustsByMac(String mac){

        Map<String,Object> equMap = getStaticEqu(mac);

        Object adjusts = equMap.get(ADJUSTS);

        Map<String,Float> adjustMap = null;

        if(equMap!=null) {

             List<Map<String,Object>> adjustList = (List<Map<String, Object>>) equMap.get(ADJUSTS);

             if(adjustList!=null) {

                 adjustMap = new HashMap<String, Float>();

                 //list to map

                 for(Map<String,Object> adjust:adjustList) {

                     if(adjust.get("value")!=null) {

                         adjustMap.put(adjust.get("key").toString(), Float.valueOf(adjust.get("value").toString()));

                     }

                 }

             }

        if(adjusts!=null&&adjusts instanceof JSONObject) {

            adjustMap = ((JSONObject)adjusts).toJavaObject(new TypeReference<Map<String,Float>>(){});

        }

        return adjustMap;

    }