Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
TDLCloud
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WitCloud
TDLCloud
Commits
de5d9c5e
Commit
de5d9c5e
authored
Sep 04, 2019
by
zhuangzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改时间相差八小时的问题
parent
58563571
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
DataUtil.java
src/main/java/com/example/tdl/util/DataUtil.java
+1
-1
DataController.java
src/main/java/com/example/tdl/web/DataController.java
+10
-10
No files found.
src/main/java/com/example/tdl/util/DataUtil.java
View file @
de5d9c5e
...
@@ -106,7 +106,7 @@ public class DataUtil {
...
@@ -106,7 +106,7 @@ public class DataUtil {
if
(
queryResult2
.
getResults
().
get
(
0
).
getSeries
()
!=
null
){
if
(
queryResult2
.
getResults
().
get
(
0
).
getSeries
()
!=
null
){
HistoryData
data
=
new
HistoryData
();
HistoryData
data
=
new
HistoryData
();
data
.
setValue
(
queryResult2
.
getResults
().
get
(
0
).
getSeries
().
get
(
0
).
getValues
().
get
(
0
).
get
(
1
).
toString
());
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
);
historyData
.
add
(
data
);
}
}
}
}
...
...
src/main/java/com/example/tdl/web/DataController.java
View file @
de5d9c5e
...
@@ -737,17 +737,17 @@ public class DataController {
...
@@ -737,17 +737,17 @@ public class DataController {
LocationDataVo
historyData
=
new
LocationDataVo
();
LocationDataVo
historyData
=
new
LocationDataVo
();
Integer
motion
=
values
.
get
(
i
).
get
(
3
)
==
null
?
0
:
Double
.
valueOf
(
values
.
get
(
i
).
get
(
3
).
toString
()).
intValue
();
Integer
motion
=
values
.
get
(
i
).
get
(
3
)
==
null
?
0
:
Double
.
valueOf
(
values
.
get
(
i
).
get
(
3
).
toString
()).
intValue
();
if
(
i
==
0
){
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
.
setLng
(
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
()));
historyData
.
setLat
(
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
()));
historyData
.
setLat
(
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
()));
historyData
.
setError
(
0
);
historyData
.
setError
(
0
);
}
else
{
}
else
{
if
(
motion
==
2
){
//静止状态
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
);
historyDataList
.
get
(
historyDataList
.
size
()-
1
).
setTime
(
time
);
}
else
{
}
else
{
String
time1
=
DataUtil
.
parseTime
(
values
.
get
(
i
).
get
(
0
).
toString
()
);
String
time1
=
DataUtil
.
UTCToCST
(
values
.
get
(
i
).
get
(
0
).
toString
(),
"+8"
);
String
time2
=
DataUtil
.
parseTime
(
values
.
get
(
i
-
1
).
get
(
0
).
toString
()
);
String
time2
=
DataUtil
.
UTCToCST
(
values
.
get
(
i
-
1
).
get
(
0
).
toString
(),
"+8"
);
Double
lng1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
());
Double
lng1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
());
Double
lat1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
());
Double
lat1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
());
Double
lng2
=
Double
.
parseDouble
(
values
.
get
(
i
-
1
).
get
(
1
).
toString
());
Double
lng2
=
Double
.
parseDouble
(
values
.
get
(
i
-
1
).
get
(
1
).
toString
());
...
@@ -790,22 +790,22 @@ public class DataController {
...
@@ -790,22 +790,22 @@ public class DataController {
if
(
values
.
get
(
i
).
get
(
1
).
toString
().
equals
(
"0.0"
))
{
if
(
values
.
get
(
i
).
get
(
1
).
toString
().
equals
(
"0.0"
))
{
continue
;
continue
;
}
else
{
}
else
{
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
.
setLng
(
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
()));
historyData
.
setLat
(
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
()));
historyData
.
setLat
(
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
()));
historyData
.
setError
(
0
);
historyData
.
setError
(
0
);
}
}
}
else
{
}
else
{
if
(
i
==
0
){
if
(
i
==
0
){
String
time1
=
DataUtil
.
parseTime
(
values
.
get
(
i
).
get
(
0
).
toString
()
);
String
time1
=
DataUtil
.
UTCToCST
(
values
.
get
(
i
).
get
(
0
).
toString
(),
"+8"
);
Double
lng1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
());
Double
lng1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
());
Double
lat1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
());
Double
lat1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
());
historyData
.
setTime
(
time1
);
historyData
.
setTime
(
time1
);
historyData
.
setLng
(
lng1
);
historyData
.
setLng
(
lng1
);
historyData
.
setLat
(
lat1
);
historyData
.
setLat
(
lat1
);
}
else
{
}
else
{
String
time1
=
DataUtil
.
parseTime
(
values
.
get
(
i
).
get
(
0
).
toString
()
);
String
time1
=
DataUtil
.
UTCToCST
(
values
.
get
(
i
).
get
(
0
).
toString
(),
"+8"
);
String
time2
=
DataUtil
.
parseTime
(
values
.
get
(
i
-
1
).
get
(
0
).
toString
()
);
String
time2
=
DataUtil
.
UTCToCST
(
values
.
get
(
i
-
1
).
get
(
0
).
toString
(),
"+8"
);
Double
lng1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
());
Double
lng1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
1
).
toString
());
Double
lat1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
());
Double
lat1
=
Double
.
parseDouble
(
values
.
get
(
i
).
get
(
2
).
toString
());
Double
lng2
=
Double
.
parseDouble
(
values
.
get
(
i
-
1
).
get
(
1
).
toString
());
Double
lng2
=
Double
.
parseDouble
(
values
.
get
(
i
-
1
).
get
(
1
).
toString
());
...
@@ -830,7 +830,7 @@ public class DataController {
...
@@ -830,7 +830,7 @@ public class DataController {
}
}
if
(
historyDataList
.
size
()
==
0
){
if
(
historyDataList
.
size
()
==
0
){
LocationDataVo
historyData
=
new
LocationDataVo
();
LocationDataVo
historyData
=
new
LocationDataVo
();
historyData
.
setTime
(
DataUtil
.
parseTime
(
values
.
get
(
0
).
get
(
0
).
toString
()
));
historyData
.
setTime
(
DataUtil
.
UTCToCST
(
values
.
get
(
0
).
get
(
0
).
toString
(),
"+8"
));
historyData
.
setLng
(
Double
.
parseDouble
(
values
.
get
(
0
).
get
(
1
).
toString
()));
historyData
.
setLng
(
Double
.
parseDouble
(
values
.
get
(
0
).
get
(
1
).
toString
()));
historyData
.
setLat
(
Double
.
parseDouble
(
values
.
get
(
0
).
get
(
2
).
toString
()));
historyData
.
setLat
(
Double
.
parseDouble
(
values
.
get
(
0
).
get
(
2
).
toString
()));
historyDataList
.
add
(
historyData
);
historyDataList
.
add
(
historyData
);
...
@@ -863,7 +863,7 @@ public class DataController {
...
@@ -863,7 +863,7 @@ public class DataController {
df
.
getRoundingMode
();
df
.
getRoundingMode
();
for
(
int
i
=
0
;
i
<
value
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
value
.
size
();
i
++)
{
HistoryData
pressureData
=
new
HistoryData
();
HistoryData
pressureData
=
new
HistoryData
();
String
time
=
DataUtil
.
parseTime
(
value
.
get
(
i
).
get
(
0
).
toString
()
);
String
time
=
DataUtil
.
UTCToCST
(
value
.
get
(
i
).
get
(
0
).
toString
(),
"+8"
);
pressureData
.
setTime
(
time
);
pressureData
.
setTime
(
time
);
String
press
=
value
.
get
(
i
).
get
(
1
).
toString
();
String
press
=
value
.
get
(
i
).
get
(
1
).
toString
();
pressureData
.
setValue
(
press
);
pressureData
.
setValue
(
press
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment