forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be 
 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java


@@ -65,6 +65,8 @@


            Map<String, Object> sensorValues = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_FIVE_MINUTES, mac);


            //如果没有数据从数据库查询


            HistoryFiveMinutely dbHistoryFiveMinutely = queryLastDataByMac(mac);


            if(ObjectUtils.isEmpty(dbHistoryFiveMinutely))


                continue;


            String dbDataStr = dbHistoryFiveMinutely.getValue();


            sensorValues = JSON.parseObject(dbDataStr, HashMap.class);


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