Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
 
	
	
	
	
	
	
	
	
	
	
	
	
	
 |  |  | 
 |  |  |     public static final String ADJUST = "adjust_"; | 
 |  |  |  | 
 |  |  |     /* | 
 |  |  |      * redis中设备实时数据key | 
 |  |  |      * redis中秒数据key | 
 |  |  |      * */ | 
 |  |  |     public static final String DEVICE_DATA = "data"; | 
 |  |  |     public static final String DATA_SECOND = "data_second"; | 
 |  |  |  | 
 |  |  |     /* | 
 |  |  |      * redis中aqi数据key | 
 
 |  |  | 
 |  |  |         //获取所有在线设备 | 
 |  |  |         List<Device> devices = deviceMapper.selectList(queryWrapper); | 
 |  |  |         for (Device device : devices) { | 
 |  |  |             Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE_DATA, device.getMac()); | 
 |  |  |             Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_SECOND, device.getMac()); | 
 |  |  |             device.setState(Constants.DEVICE_STATE_OFFLINE); | 
 |  |  |             if (data != null && data.containsKey("DataTime")) { | 
 |  |  |                 Date time = DateUtils.getDate((String) data.get("DataTime"), DateUtils.yyyyMMddHHmmss_EN); | 
 
 |  |  | 
 |  |  |             //数据校准 | 
 |  |  |             data = deviceService.adjustDeviceData(data); | 
 |  |  |             //存入redis | 
 |  |  |             redisTemplate.opsForHash().put(RedisConstants.DEVICE_DATA, mac, data); | 
 |  |  |             redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data); | 
 |  |  |             //判断并修改设备状态 | 
 |  |  |             deviceService.judgeDeviceState(data); | 
 |  |  |             ack.acknowledge(); |