Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
new-socketemulator
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
李远洪
new-socketemulator
Commits
0130c085
Commit
0130c085
authored
Jul 30, 2020
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
M500模拟器增加了数据补报功能
parent
cc2e2149
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
246 additions
and
3 deletions
+246
-3
data/messageTools/carData/012201500010.json
data/messageTools/carData/012201500010.json
+1
-1
data/protocolTools/carData/M202003060520.json
data/protocolTools/carData/M202003060520.json
+1
-1
lib/util/DelaySend.py
lib/util/DelaySend.py
+234
-0
templates/otherTools/maptool.html
templates/otherTools/maptool.html
+1
-1
views/protocolTools/M_carSimulater_process.py
views/protocolTools/M_carSimulater_process.py
+9
-0
No files found.
data/messageTools/carData/012201500010.json
View file @
0130c085
{
"time"
:
{
"dateTime"
:
"2020-07-30 10:17:57"
,
"date"
:
"2020-07-30"
,
"time"
:
"10:17:57"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
2981
,
"todayTotalOil"
:
206
,
"todayTotalTime"
:
185
,
"theMilleage"
:
2981
,
"theOil"
:
206
,
"theTime"
:
185
},
"travelData"
:
{
"totalMilleage"
:
129666
,
"totalOil"
:
11329
,
"totalTime"
:
7960
}}
\ No newline at end of file
{
"time"
:
{
"dateTime"
:
"2020-07-30 10:17:57"
,
"date"
:
"2020-07-30"
,
"time"
:
"10:17:57"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
4261
,
"todayTotalOil"
:
286
,
"todayTotalTime"
:
265
,
"theMilleage"
:
1280
,
"theOil"
:
80
,
"theTime"
:
80
},
"travelData"
:
{
"totalMilleage"
:
130946
,
"totalOil"
:
11409
,
"totalTime"
:
8040
}}
\ No newline at end of file
data/protocolTools/carData/M202003060520.json
View file @
0130c085
{
"time"
:
{
"dateTime"
:
"2020-07-30 10:05:57"
,
"date"
:
"2020-07-30"
,
"time"
:
"10:05:57"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
4454
,
"todayTotalOil"
:
284
,
"todayTotalTime"
:
278
,
"theMilleage"
:
3075
,
"theOil"
:
195
,
"theTime"
:
192
},
"travelData"
:
{
"totalMilleage"
:
638772
,
"totalOil"
:
56232
,
"totalTime"
:
38492
},
"event"
:
{
"threeRapid"
:
{
"totalRapidlyAccelerate"
:
55
,
"totalSharpSlowdown"
:
44
,
"totalSharpTurn"
:
46
}}}
\ No newline at end of file
{
"time"
:
{
"dateTime"
:
"2020-07-30 10:05:57"
,
"date"
:
"2020-07-30"
,
"time"
:
"10:05:57"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
4796
,
"todayTotalOil"
:
311
,
"todayTotalTime"
:
299
,
"theMilleage"
:
259
,
"theOil"
:
19
,
"theTime"
:
16
},
"travelData"
:
{
"totalMilleage"
:
639114
,
"totalOil"
:
56259
,
"totalTime"
:
38513
},
"event"
:
{
"threeRapid"
:
{
"totalRapidlyAccelerate"
:
55
,
"totalSharpSlowdown"
:
44
,
"totalSharpTurn"
:
46
}}}
\ No newline at end of file
lib/util/DelaySend.py
0 → 100644
View file @
0130c085
This diff is collapsed.
Click to expand it.
templates/otherTools/maptool.html
View file @
0130c085
...
...
@@ -42,7 +42,7 @@
<a
href=
"#"
class=
"btn btn-default"
role=
"button"
id=
"ctrArea2"
onclick=
"ctrAreaShow(this)"
>
轨迹工具
</a>
<a
href=
"#"
class=
"btn btn-default"
role=
"button"
id=
"ctrArea3"
onclick=
"ctrAreaShow(this)"
>
其他工具
</a>
</div>
<div
id=
"ctrArea_1"
style=
"width:400px;height:
175
px;background:white;z-index:50;position:absolute;top:160px;right:40px;border-radius:5px;display:none;"
class=
"btn-group btn-group-justified"
role=
"group"
>
<div
id=
"ctrArea_1"
style=
"width:400px;height:
200
px;background:white;z-index:50;position:absolute;top:160px;right:40px;border-radius:5px;display:none;"
class=
"btn-group btn-group-justified"
role=
"group"
>
<div
style=
"border-width: 1px;border-bottom: 1px solid #eee;margin: 10px;padding-bottom: 5px;"
>
<label>
经 ,纬 度 :
</label><input
id=
"toLngLat"
type=
"text"
class=
"form-control"
value=
"106.54041,29.40268"
style=
"width:200px;"
>
<button
type=
"button"
class=
"btn btn-default"
onclick=
"setposition()"
>
定位
</button>
...
...
views/protocolTools/M_carSimulater_process.py
View file @
0130c085
...
...
@@ -16,6 +16,7 @@ import json
import
traceback
from
lib.socket.service.ProtocolSimulaterService
import
ProtocolSimulaterService
from
lib.util
import
fileUtil
from
lib.util.DelaySend
import
DelaySend
M_carSimulater_process
=
Blueprint
(
'M_carSimulater_process'
,
__name__
)
...
...
@@ -133,6 +134,14 @@ def login():
versionMsg
=
versionObj
.
generateVersionMsg
()
service
.
serviceSendMsg
(
versionMsg
,
"版本"
)
service
.
setSn
(
service
.
getSn
()
+
1
)
# 数据补报
if
(
os
.
path
.
exists
(
"data/protocolTools/sendMsg/"
+
params
[
"carId"
])):
ds
=
DelaySend
(
params
[
"carId"
],
service
)
ds
.
sendDelayMsgs
()
else
:
pass
data
[
"status"
]
=
"200"
data
[
"message"
]
=
"登录成功!"
except
BaseException
as
e
:
...
...
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