Commit e7eae89e authored by zhuangzhuang's avatar zhuangzhuang

修改数据时间相差八小时的bug

parent 2441df6c
......@@ -106,7 +106,7 @@ public class DataUtil {
if(queryResult2.getResults().get(0).getSeries() != null){
HistoryData data = new HistoryData();
data.setValue(queryResult2.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString());
data.setTime(UTCToCST(queryResult2.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString(),"0"));
data.setTime(UTCToCST(queryResult2.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString(),"+8"));
historyData.add(data);
}
}
......@@ -159,7 +159,7 @@ public class DataUtil {
List<HistoryData> historyDataList = new ArrayList<>();
for (List<Object> value : values) {
HistoryData historyData = new HistoryData();
historyData.setTime(parseTime(value.get(0).toString()));
historyData.setTime(UTCToCST(value.get(0).toString(),"+8"));
if (alias.contains("a0")) {
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());
......@@ -220,7 +220,7 @@ public class DataUtil {
List<HistoryData> historyDataList = new ArrayList<>();
for (int i = 0; i < value.size(); i++) {
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());
historyDataList.add(historyData);
}
......
......@@ -740,17 +740,17 @@ public class DataController {
LocationDataVo historyData = new LocationDataVo();
Integer motion = values.get(i).get(3) == null ? 0 :Double.valueOf(values.get(i).get(3).toString()).intValue();
if(i == 0){
historyData.setTime(DataUtil.parseTime(values.get(i).get(0).toString()));
historyData.setTime(DataUtil.UTCToCST(values.get(i).get(0).toString(),"+8"));
historyData.setLng(Double.parseDouble(values.get(i).get(1).toString()));
historyData.setLat(Double.parseDouble(values.get(i).get(2).toString()));
historyData.setError(0);
}else{
if(motion == 2){ //静止状态
String time = DataUtil.parseTime(values.get(i).get(0).toString());
String time = DataUtil.UTCToCST(values.get(i).get(0).toString(),"+8");
historyDataList.get(historyDataList.size()-1).setTime(time);
}else{
String time1 = DataUtil.parseTime(values.get(i).get(0).toString());
String time2 = DataUtil.parseTime(values.get(i-1).get(0).toString());
String time1 = DataUtil.UTCToCST(values.get(i).get(0).toString(),"+8");
String time2 = DataUtil.UTCToCST(values.get(i-1).get(0).toString(),"+8");
Double lng1 = Double.parseDouble(values.get(i).get(1).toString());
Double lat1 = Double.parseDouble(values.get(i).get(2).toString());
Double lng2 = Double.parseDouble(values.get(i-1).get(1).toString());
......
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