Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-13 91a88471d84246524548a318aec1f22735cfedc9

 screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java

@@ -133,7 +133,7 @@
            //数据校准
            data = deviceService.adjustDeviceData(data);
            //存入redis
            redisTemplate.opsForValue().set(RedisConstants.DEVICE_DATA + mac, data);
            redisTemplate.opsForHash().put(RedisConstants.DEVICE_DATA, mac, data);
            //判断并修改设备状态
            deviceService.judgeDeviceState(data);
            ack.acknowledge();