From 25576c047e39101a4784d8acffc92af3f35aa215 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 29 Nov 2022 16:34:32 +0800
Subject: [PATCH] 解决国控站数据补偿问题
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
index 69bf01c..586d8bf 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
@@ -46,14 +46,14 @@
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
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);
--
Gitblit v1.8.0