jinpengyong
2023-08-25 9ea7115581a3fd60fdf784901fa04b23fd7cb591
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -99,18 +99,18 @@
            }
            //数据过滤
            data.remove("time");
//            data.remove("time");
            data.remove("entryTime");
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String format = dateFormat.format(new Date().getTime());
            //获取年份
            String substring = format.substring(0, 4);
            String substring1 = time.toString().substring(0, 4);
            String replace = time.toString().replace(substring1, substring);
            data.put("DataTime",replace);
//            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//            String format = dateFormat.format(new Date().getTime());
//            //获取年份
//            String substring = format.substring(0, 4);
//
//            String substring1 = time.toString().substring(0, 4);
//
//            String replace = time.toString().replace(substring1, substring);
//
//            data.put("DataTime",replace);
            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
            Map<String, Object> newMap = new HashMap<>();