| | |
| | | Integer version = (Integer) versionInfo.get("id"); |
| | | |
| | | Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); |
| | | String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN); |
| | | String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN); |
| | | |
| | | result.put("mac", mac); |
| | | result.put("time", DateUtils.addHours(time, -1)); |
| | |
| | | historyHourlyMapper.insertHistoryHourly(result); |
| | | |
| | | //数据校准 |
| | | dataAdjust = deviceService.adjustDeviceData(dataAdjust); |
| | | dataAdjust = deviceService.adjustDeviceData(dataAdjust,"2"); |
| | | |
| | | //校准后小时表insert |
| | | result.put("timeUnits", yearAndMonth); |