Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integrated-scheduling-v3
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
1
Merge Requests
1
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
张晓彤
integrated-scheduling-v3
Commits
3d620a76
Commit
3d620a76
authored
Jun 19, 2022
by
张晓彤
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redis日志
parent
de5af0cd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
app.py
app.py
+2
-0
dispatcher.py
dispatcher.py
+16
-6
No files found.
app.py
View file @
3d620a76
...
@@ -35,6 +35,8 @@ def dispatch_request():
...
@@ -35,6 +35,8 @@ def dispatch_request():
# 获取日志器
# 获取日志器
logger
=
get_logger
(
"zxt.request"
)
logger
=
get_logger
(
"zxt.request"
)
logger
.
info
(
"请求调度模式"
)
try
:
try
:
# 清空数据库缓存
# 清空数据库缓存
...
...
dispatcher.py
View file @
3d620a76
...
@@ -725,8 +725,8 @@ class DispatchSubmission:
...
@@ -725,8 +725,8 @@ class DispatchSubmission:
if
item
is
None
:
if
item
is
None
:
raise
Exception
(
"调度计划表与实时监控不匹配"
)
raise
Exception
(
"调度计划表与实时监控不匹配"
)
self
.
logger
.
info
(
"dispatch-to-redis"
)
#
self.logger.info("dispatch-to-redis")
self
.
logger
.
info
(
item
.
id
+
" "
+
item
.
truck_id
+
" "
+
item
.
exactor_id
+
" "
+
item
.
dump_id
)
#
self.logger.info(item.id + " " + item.truck_id + " " + item.exactor_id + " " + item.dump_id)
except
Exception
as
es
:
except
Exception
as
es
:
self
.
logger
.
error
(
es
)
self
.
logger
.
error
(
es
)
item
=
(
item
=
(
...
@@ -735,6 +735,9 @@ class DispatchSubmission:
...
@@ -735,6 +735,9 @@ class DispatchSubmission:
# group_id=group_id,
# group_id=group_id,
isauto
=
1
,
isdeleted
=
0
,
)
.
first
())
isauto
=
1
,
isdeleted
=
0
,
)
.
first
())
self
.
logger
.
info
(
"dispatch-to-redis"
)
self
.
logger
.
info
(
item
.
id
+
" "
+
item
.
truck_id
+
" "
+
item
.
exactor_id
+
" "
+
item
.
dump_id
)
try
:
try
:
record
[
"exactorId"
]
=
item
.
exactor_id
record
[
"exactorId"
]
=
item
.
exactor_id
record
[
"dumpId"
]
=
item
.
dump_id
record
[
"dumpId"
]
=
item
.
dump_id
...
@@ -761,8 +764,8 @@ class DispatchSubmission:
...
@@ -761,8 +764,8 @@ class DispatchSubmission:
if
item
is
None
:
if
item
is
None
:
raise
Exception
(
"调度计划表与实时监控不匹配"
)
raise
Exception
(
"调度计划表与实时监控不匹配"
)
self
.
logger
.
info
(
"dispatch-to-redis"
)
#
self.logger.info("dispatch-to-redis")
self
.
logger
.
info
(
item
.
id
+
" "
+
item
.
truck_id
+
" "
+
item
.
exactor_id
+
" "
+
item
.
dump_id
)
#
self.logger.info(item.id + " " + item.truck_id + " " + item.exactor_id + " " + item.dump_id)
except
Exception
as
es
:
except
Exception
as
es
:
self
.
logger
.
error
(
es
)
self
.
logger
.
error
(
es
)
item
=
(
item
=
(
...
@@ -770,6 +773,10 @@ class DispatchSubmission:
...
@@ -770,6 +773,10 @@ class DispatchSubmission:
.
filter_by
(
truck_id
=
truck_id
,
.
filter_by
(
truck_id
=
truck_id
,
# group_id=group_id,
# group_id=group_id,
isauto
=
1
,
isdeleted
=
0
,
)
.
first
())
isauto
=
1
,
isdeleted
=
0
,
)
.
first
())
self
.
logger
.
info
(
"dispatch-to-redis"
)
self
.
logger
.
info
(
item
.
id
+
" "
+
item
.
truck_id
+
" "
+
item
.
exactor_id
+
" "
+
item
.
dump_id
)
try
:
try
:
record
[
"exactorId"
]
=
self
.
excavator
.
excavator_index_to_uuid_dict
[
dispatch_seq
[
1
]]
record
[
"exactorId"
]
=
self
.
excavator
.
excavator_index_to_uuid_dict
[
dispatch_seq
[
1
]]
record
[
"dumpId"
]
=
item
.
dump_id
record
[
"dumpId"
]
=
item
.
dump_id
...
@@ -801,8 +808,8 @@ class DispatchSubmission:
...
@@ -801,8 +808,8 @@ class DispatchSubmission:
# self.logger.info(dispatch_seq[1])
# self.logger.info(dispatch_seq[1])
# self.logger.info(DeviceMap.excavator_index_to_uuid_dict[dispatch_seq[1]])
# self.logger.info(DeviceMap.excavator_index_to_uuid_dict[dispatch_seq[1]])
self
.
logger
.
info
(
"item"
)
#
self.logger.info("item")
self
.
logger
.
info
(
item
.
id
+
" "
+
item
.
truck_id
+
" "
+
item
.
exactor_id
+
" "
+
item
.
dump_id
)
#
self.logger.info(item.id + " " + item.truck_id + " " + item.exactor_id + " " + item.dump_id)
except
Exception
as
es
:
except
Exception
as
es
:
self
.
logger
.
error
(
es
)
self
.
logger
.
error
(
es
)
item
=
(
item
=
(
...
@@ -811,6 +818,9 @@ class DispatchSubmission:
...
@@ -811,6 +818,9 @@ class DispatchSubmission:
# group_id=group_id,
# group_id=group_id,
isauto
=
1
,
isdeleted
=
0
)
.
first
())
isauto
=
1
,
isdeleted
=
0
)
.
first
())
self
.
logger
.
info
(
"dispatch-to-redis"
)
self
.
logger
.
info
(
item
.
id
+
" "
+
item
.
truck_id
+
" "
+
item
.
exactor_id
+
" "
+
item
.
dump_id
)
try
:
try
:
record
[
"exactorId"
]
=
item
.
exactor_id
record
[
"exactorId"
]
=
item
.
exactor_id
record
[
"dumpId"
]
=
item
.
dump_id
record
[
"dumpId"
]
=
item
.
dump_id
...
...
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