forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297 
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java


@@ -18,9 +18,8 @@


import com.moral.constant.KafkaConstants;


import com.moral.constant.RedisConstants;




/*


 * 普通设备消费者


 * */






@Component


@Slf4j


public class DeviceConsumer {


@@ -58,7 +57,7 @@


            }




            //数据过滤


            data.remove("time");


//            data.remove("time");


            data.remove("entryTime");


            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();


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


@@ -97,7 +96,7 @@


            }




            //数据过滤


            data.remove("time");


//            data.remove("time");


            data.remove("entryTime");


            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();


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


@@ -138,7 +137,7 @@


            data.remove("entryTime");




            //数据校准


            data = deviceService.adjustDeviceData(data);


            data = deviceService.adjustDeviceData(data,"0");


            //存入redis


            data.put("DataTime", time);


            redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);