| | |
|---|
| | | result.put("version", version); |
|---|
| | | |
|---|
| | | Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); |
|---|
| | | result.put("time", time); |
|---|
| | | result.put("time", DateUtils.getDateOfMin(time, -1)); |
|---|
| | | result.put("value", JSONObject.toJSONString(data)); |
|---|
| | | String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN); |
|---|
| | | String timeUnits = DateUtils.dateToDateString(DateUtils.getDateOfMin(time, -1), DateUtils.yyyyMM_EN); |
|---|
| | | result.put("timeUnits", timeUnits + "_" + Constants.UN_ADJUST); |
|---|
| | | |
|---|
| | | //原始数据（未校准） |
|---|
| | | historyMinutelyMapper.insertHistoryMinutely(result); |
|---|
| | | |
|---|
| | | //数据校准 |
|---|
| | | dataAdjust = deviceService.adjustDeviceData(dataAdjust); |
|---|
| | | dataAdjust = deviceService.adjustDeviceData(dataAdjust,"1"); |
|---|
| | | result.put("timeUnits", timeUnits); |
|---|
| | | result.put("value", JSONObject.toJSONString(dataAdjust)); |
|---|
| | | historyMinutelyMapper.insertHistoryMinutely(result); |
|---|
