jinpengyong
2021-07-15 371a381267699280f45748c13ed42faba66b6577
update redis key
3 files modified
8 ■■■■ changed files
screen-common/src/main/java/com/moral/constant/RedisConstants.java 4 ●●●● patch | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 2 ●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java 2 ●●● patch | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/RedisConstants.java
@@ -49,9 +49,9 @@
    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
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -43,7 +43,7 @@
        //获取所有在线设备
        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);
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
@@ -133,7 +133,7 @@
            //数据校准
            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();