screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -37,7 +37,8 @@ public void insertHistoryHourly(Map<String, Object> data) { Map<String, Object> dataAdjust = new HashMap<>(data); String mac = data.remove("mac").toString(); Date time = DateUtils.dataToTimeStampTime(new Date(new Long((String) data.remove("DataTime"))), DateUtils.yyyy_MM_dd_HH_EN); Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyy_MM_dd_HH_EN); Integer version = (Integer) data.remove("ver"); Map<String, Object> result = new HashMap<>(data); result.put("mac", mac);