Commit 739970b3 authored by zhuangzhuang's avatar zhuangzhuang

1.修改温湿度时间相差八小时的问题

parent de5d9c5e
...@@ -159,7 +159,7 @@ public class DataUtil { ...@@ -159,7 +159,7 @@ public class DataUtil {
List<HistoryData> historyDataList = new ArrayList<>(); List<HistoryData> historyDataList = new ArrayList<>();
for (List<Object> value : values) { for (List<Object> value : values) {
HistoryData historyData = new HistoryData(); HistoryData historyData = new HistoryData();
historyData.setTime(parseTime(value.get(0).toString())); historyData.setTime(UTCToCST(value.get(0).toString(),"+8"));
if (alias.contains("a0")) { if (alias.contains("a0")) {
if (value.get(1) != null && Double.valueOf(value.get(1).toString()) > 0 && Double.valueOf(value.get(1).toString()) < 588897) { if (value.get(1) != null && Double.valueOf(value.get(1).toString()) > 0 && Double.valueOf(value.get(1).toString()) < 588897) {
historyData.setValue(value.get(1) == null ? "" : value.get(1).toString()); historyData.setValue(value.get(1) == null ? "" : value.get(1).toString());
...@@ -220,7 +220,7 @@ public class DataUtil { ...@@ -220,7 +220,7 @@ public class DataUtil {
List<HistoryData> historyDataList = new ArrayList<>(); List<HistoryData> historyDataList = new ArrayList<>();
for (int i = 0; i < value.size(); i++) { for (int i = 0; i < value.size(); i++) {
HistoryData historyData = new HistoryData(); HistoryData historyData = new HistoryData();
historyData.setTime(parseTime(value.get(i).get(0).toString())); historyData.setTime(UTCToCST(value.get(i).get(0).toString(),"+8"));
historyData.setValue(value.get(i).get(1).toString()); historyData.setValue(value.get(i).get(1).toString());
historyDataList.add(historyData); historyDataList.add(historyData);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment