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
b95b5228
Commit
b95b5228
authored
Feb 07, 2023
by
张晓彤
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
40c4ed07
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
truck.py
equipment/truck.py
+2
-2
gothrough_digging.py
gothrough/gothrough_digging.py
+7
-4
No files found.
equipment/truck.py
View file @
b95b5228
...
@@ -325,7 +325,7 @@ class TruckInfo(WalkManage):
...
@@ -325,7 +325,7 @@ class TruckInfo(WalkManage):
.
first
()
.
first
()
)
)
if
task
in
(
empty_task_set
+
heavy_task_set
)
and
item
is
None
:
if
task
in
(
empty_task_set
+
heavy_task_set
)
and
item
is
None
:
raise
Exception
(
f
"矿卡 {truck_id} 配对关系异常"
)
raise
Exception
(
f
"矿卡 {truck_id} 配对关系异常
(不匹配或者不存在)
"
)
except
Exception
as
es
:
except
Exception
as
es
:
self
.
logger
.
error
(
es
)
self
.
logger
.
error
(
es
)
session_postgre
.
rollback
()
session_postgre
.
rollback
()
...
@@ -459,7 +459,7 @@ class TruckInfo(WalkManage):
...
@@ -459,7 +459,7 @@ class TruckInfo(WalkManage):
)
)
if
task
in
empty_task_set
+
heavy_task_set
and
item
is
None
:
# 矿卡处于正常工作状态, 但查询不到派车计划
if
task
in
empty_task_set
+
heavy_task_set
and
item
is
None
:
# 矿卡处于正常工作状态, 但查询不到派车计划
raise
Exception
(
f
"矿卡 {truck_id} 配对关系异常"
)
raise
Exception
(
f
"矿卡 {truck_id} 配对关系异常
(不匹配或不存在)
"
)
except
Exception
as
es
:
except
Exception
as
es
:
self
.
logger
.
error
(
"配对关系异常"
)
self
.
logger
.
error
(
"配对关系异常"
)
self
.
logger
.
error
(
es
)
self
.
logger
.
error
(
es
)
...
...
gothrough/gothrough_digging.py
View file @
b95b5228
...
@@ -17,7 +17,7 @@ from app import app
...
@@ -17,7 +17,7 @@ from app import app
import
uuid
import
uuid
@app.route
(
"/
redispatc
h"
,
methods
=
[
"POST"
])
@app.route
(
"/
go_throug
h"
,
methods
=
[
"POST"
])
def
redispatch_request
():
def
redispatch_request
():
# 获取报文数据
# 获取报文数据
data_json
=
request
.
get_json
()
data_json
=
request
.
get_json
()
...
@@ -25,7 +25,7 @@ def redispatch_request():
...
@@ -25,7 +25,7 @@ def redispatch_request():
# 车辆id
# 车辆id
request_truck_id
=
data_json
.
get
(
"truck_id"
)
request_truck_id
=
data_json
.
get
(
"truck_id"
)
request_truck_id
=
'309705a0-5ddf-4559-b6c4-ee17a57677ad'
#
request_truck_id = '309705a0-5ddf-4559-b6c4-ee17a57677ad'
# 调度开始时间
# 调度开始时间
rtd_start_time
=
datetime
.
now
()
rtd_start_time
=
datetime
.
now
()
...
@@ -134,8 +134,11 @@ def redispatch_request():
...
@@ -134,8 +134,11 @@ def redispatch_request():
# 装载区区分
# 装载区区分
# closer_area_id, further_area_id = area_analysis(excavators_id)
# closer_area_id, further_area_id = area_analysis(excavators_id)
closer_area_id
=
'f1d5f017-5134-65a0-f657-89eed06eacc1'
# closer_area_id = 'f1d5f017-5134-65a0-f657-89eed06eacc1'
further_area_id
=
'ef89f721-5134-3ef1-91e2-95b4e5004675'
# further_area_id = 'ef89f721-5134-3ef1-91e2-95b4e5004675'
closer_area_id
=
'7ff73575-2134-afd4-1065-d5d60e8751c9'
further_area_id
=
'79584290-1134-8b85-f4cc-1dcf64fc3456'
closer_excavator_id
,
further_excavator_id
=
DispatchInfo
.
load_excavator_dict
[
closer_area_id
],
\
closer_excavator_id
,
further_excavator_id
=
DispatchInfo
.
load_excavator_dict
[
closer_area_id
],
\
DispatchInfo
.
load_excavator_dict
[
further_area_id
]
DispatchInfo
.
load_excavator_dict
[
further_area_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