传感器平均数据 报表接口

xufenglei

2017-11-14 91e5d3d85c737b96b2c4a1994e2b861cc083453c

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

@@ -32,7 +32,7 @@
    private static final String ADJUSTS = "adjusts";

    private static final String ORG_ID = "orgId";

    private static final String AREA_CODE = "areaCode";

    private static final String MONITORPOINT_ID= "monitorpoint";

    private static final String MONITORPOINT_ID= "monitorpointId";

    //设备静态数据，不常改动。

    private static String getStaticEquKey(String mac) {

       return "static_equ_"+mac;

@@ -46,19 +46,20 @@
       Map<String,Object> equMap = null;

       if(StringUtils.isEmpty(staticEquJson)) {

           equMap = jobDao.findEquWithAdjustsByMac(mac);

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

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

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

              //list to map

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

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

                    //没有值的清空

                    adjustListWithData.add(adjust);

                 }

              }

            equMap.put(ADJUSTS,adjustListWithData);

           setStaticEqu(mac,equMap);



           if(equMap!=null) {

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

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

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

               //list to map

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

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

                     //没有值的清空

                     adjustListWithData.add(adjust);

                  }

               }

                equMap.put(ADJUSTS,adjustListWithData);

                setStaticEqu(mac,equMap);

           }

       }else {

           equMap = JSON.parseObject(staticEquJson,new TypeReference<Map<String,Object>>(){});

          }

@@ -69,23 +70,33 @@
     */

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

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

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

       //list to map

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

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

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

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

          }

       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()));

                   }

                }

            }

       }

       return adjustMap;

    }

    //格式：state_组织ID_地区ID_监控点ID_mac

    private String getEquStateKey(String mac) {

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

         String orgId = equMap.get(ORG_ID)==null?"$":equMap.get(ORG_ID).toString();

         String areaCode = equMap.get(AREA_CODE)==null?"$":equMap.get(AREA_CODE).toString();

         String mpointId = equMap.get(MONITORPOINT_ID)==null?"$":equMap.get(MONITORPOINT_ID).toString();

         return "state_"+orgId+"_"+areaCode+"_"+mpointId+"_"+mac;

         if(equMap!=null) {

             String orgId = equMap.get(ORG_ID)==null?"$":equMap.get(ORG_ID).toString();

             String areaCode = equMap.get(AREA_CODE)==null?"$":equMap.get(AREA_CODE).toString();

             String mpointId = equMap.get(MONITORPOINT_ID)==null?"$":equMap.get(MONITORPOINT_ID).toString();

             return "state_"+orgId+"_"+areaCode+"_"+mpointId+"_"+mac;

         }

         else {

            return "state_$_$_$_"+mac;

         }

    }

    //把含有状态的设备监控功能数据 存储到redis

    public void setEquState(String mac,Map<String,Object> equWithStateMap) {