| | |
|---|
| | | @Override |
|---|
| | | @Transactional |
|---|
| | | public void insertHistoryHourly(Map<String, Object> data) { |
|---|
| | | Integer version = (Integer) data.remove("ver"); |
|---|
| | | Map<String, Object> dataAdjust = new HashMap<>(data); |
|---|
| | | String mac = data.remove("mac").toString(); |
|---|
| | | |
|---|
| | | Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); |
|---|
| | | Integer version = (Integer) data.remove("ver"); |
|---|
| | | |
|---|
| | | Map<String, Object> result = new HashMap<>(); |
|---|
| | | result.put("mac", mac); |
|---|
| | | result.put("time", time); |
|---|
| | |
|---|
| | | |
|---|
| | | //数据校准 |
|---|
| | | dataAdjust = deviceService.adjustDeviceData(dataAdjust); |
|---|
| | | dataAdjust.remove("mac"); |
|---|
| | | dataAdjust.remove("DataTime"); |
|---|
| | | dataAdjust.remove("ver"); |
|---|
| | | result.put("timeUnits", Constants.TRANSITION); |
|---|
| | | result.put("value", JSONObject.toJSONString(dataAdjust)); |
|---|
| | | //校准后中间小时表insert |
|---|
| | | historyHourlyMapper.insertHistoryHourly(result); |
|---|
| | | |
|---|
| | | HistoryHourly historyHourly = new HistoryHourly(); |
|---|
| | | historyHourly.setMac(mac); |
|---|
| | | historyHourly.setTime(time); |
|---|
| | | historyHourly.setVersion(version); |
|---|
| | | historyHourly.setValue(JSONObject.toJSONString(dataAdjust)); |
|---|
| | | |
|---|
| | | //校准后小时表insert |
|---|
| | | historyHourlyMapper.insert(historyHourly); |
|---|
| | | } |
|---|
| | | } |
|---|
