From 854a5baf0b9071ffdab7b82d697464c7b7aadbeb Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 02 Sep 2021 08:40:15 +0800 Subject: [PATCH] kafka小时数据修改 --- screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java index 00c3443..35be6ae 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java @@ -40,17 +40,19 @@ @Override @Transactional public void insertHistoryHourly(Map<String, Object> data) { + //������������������ + Map<String, Object> dataAdjust = new HashMap<>(data); + //��������������������� + Map<String, Object> result = new HashMap<>(); String mac = data.remove("mac").toString(); //������mac������������ Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac); Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version"); Integer version = (Integer) versionInfo.get("id"); - Map<String, Object> dataAdjust = new HashMap<>(data); Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN); - Map<String, Object> result = new HashMap<>(); result.put("mac", mac); result.put("time", time); result.put("version", version); -- Gitblit v1.8.0