Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DA-Platform
Overview
Overview
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
文档服务地址:
http://47.92.0.57:3000/
周报索引地址:
http://47.92.0.57:3000/s/NruNXRYmV
Open sidebar
Berlin
DA-Platform
Commits
d61c23b5
Commit
d61c23b5
authored
Aug 27, 2020
by
李景熙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
任务状态进一步修改
parent
b0e172a0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
13 deletions
+42
-13
Relation.py
DAPlatform/dao/Relation.py
+13
-1
Task.py
DAPlatform/dao/Task.py
+18
-7
1598515555.txt
DAPlatform/upload/1598515555.txt
+9
-0
task.py
DAPlatform/views/task.py
+2
-5
No files found.
DAPlatform/dao/Relation.py
View file @
d61c23b5
...
...
@@ -271,11 +271,23 @@ def check_slice_completed(slice_id):
else
:
return
False
def
check_slice_shenhe_completed
(
slice_id
):
try
:
find
=
Relation
.
select
()
.
where
(
Relation
.
slice_id
==
slice_id
)
for
i
in
find
:
if
i
.
flag2
==
0
:
return
False
except
:
return
False
else
:
return
True
if
__name__
==
'__main__'
:
# Relation.drop_table()
# Relation.create_table()
print
(
get_flag_count
(
1
,
10
))
#
print(get_flag_count(1, 10))
# Relation.delete().where(Relation.relation_id == 67).execute()
# print(get_state(1, 5))
# create_relation(3, 1, 2)
print
(
find_slice
(
26
))
DAPlatform/dao/Task.py
View file @
d61c23b5
...
...
@@ -44,7 +44,7 @@ def create_task(publish_id, task_name):
def
find_task_by_name
(
task_name
,
start
,
num
):
try
:
find
=
Task
.
select
(
Task
.
task_id
,
Task
.
task_name
,
Task
.
publish_id
,
Task
.
publish_time
,
Task
.
task_state
)
.
where
(
Task
.
task_name
.
contains
(
task_name
),
Task
.
task_state
==
0
and
1
)
.
order_by
(
Task
.
task_id
.
desc
())
Task
.
task_name
.
contains
(
task_name
),
Task
.
task_state
<=
1
)
.
order_by
(
Task
.
task_id
.
desc
())
index
=
0
list
=
[]
while
index
+
start
<
len
(
find
)
and
index
<
num
:
...
...
@@ -70,7 +70,7 @@ def find_task_by_name(task_name, start, num):
def
find_task
(
start
,
num
):
try
:
find
=
Task
.
select
(
Task
.
task_id
,
Task
.
task_name
,
Task
.
publish_id
,
Task
.
publish_time
,
Task
.
task_state
)
.
where
(
Task
.
task_state
==
0
and
1
)
.
order_by
(
Task
.
task_id
.
desc
())
Task
.
task_state
<=
1
)
.
order_by
(
Task
.
task_id
.
desc
())
index
=
0
list
=
[]
while
index
+
start
<
len
(
find
)
and
index
<
num
:
...
...
@@ -198,7 +198,7 @@ def find_task_my_task(executor, start, num):
slice_list
=
Relation
.
find_slice_by_executor
(
executor
)
task_list
=
Slice
.
find_task_by_slicelist
(
slice_list
)
find
=
Task
.
select
(
Task
.
task_id
,
Task
.
task_name
,
Task
.
publish_id
,
Task
.
publish_time
,
Task
.
task_state
)
.
where
(
Task
.
task_id
<<
task_list
,
Task
.
task_state
==
1
and
2
)
.
order_by
(
Task
.
task_id
.
desc
())
Task
.
task_id
<<
task_list
,
Task
.
task_state
<=
2
)
.
order_by
(
Task
.
task_id
.
desc
())
index
=
0
list
=
[]
while
index
+
start
<
len
(
find
)
and
index
<
num
:
...
...
@@ -270,7 +270,8 @@ def set_state(task_id, state):
slice_list
=
Slice
.
find_slicelist_by_taskId
(
t
.
task_id
)
flag
=
True
for
i
in
slice_list
:
if
not
Relation
.
find_slice
(
i
.
slice_id
):
print
(
i
.
slice_id
)
if
Relation
.
find_slice
(
i
.
slice_id
):
flag
=
False
if
flag
:
t
.
task_state
=
2
...
...
@@ -284,6 +285,14 @@ def set_state(task_id, state):
flag
=
False
if
flag
:
t
.
task_state
=
3
elif
state
==
'check'
:
slice_list
=
Slice
.
find_slicelist_by_taskId
(
t
.
task_id
)
flag
=
True
for
i
in
slice_list
:
if
not
Relation
.
check_slice_shenhe_completed
(
i
.
slice_id
):
flag
=
False
if
flag
:
t
.
task_state
=
4
except
:
return
False
else
:
...
...
@@ -293,6 +302,7 @@ def set_state(task_id, state):
if
__name__
==
'__main__'
:
# print(find_task_my_task(1,1,1))
Task
.
drop_table
()
Task
.
create_table
()
print
(
judge_completed
(
49
,
1
))
# Task.drop_table()
# Task.create_table()
# print(judge_completed(49, 1))
set_state
(
15
,
'check'
)
\ No newline at end of file
DAPlatform/upload/1598515555.txt
0 → 100644
View file @
d61c23b5
前端:
区分已被选择三次的分片和其他可选分片
发布者终止任务按钮
标注者我的任务界面区分被终止任务
标注者主动删除任务
后端:
限制对已选择三次的分片的再选
终止任务的后端删除
DAPlatform/views/task.py
View file @
d61c23b5
...
...
@@ -191,15 +191,11 @@ def get_task_detail():
# 审核时候打分的接口,前端传送打分的具体信息(文件id,分片id,标注者id,打分详情),后端在标注关系表中查找对应的标注,并将分数存储下来,之后修改审核状态即flag2 = True,代表已审核
@task.route
(
"/gradePieces"
,
methods
=
[
"GET"
])
def
grade
():
print
(
'grade'
)
data_id
=
request
.
args
[
'fileId'
]
userId
=
request
.
args
[
'userId'
]
scoreForm
=
eval
(
request
.
args
[
'scoreForm'
])
score
=
int
(
scoreForm
[
'score'
])
accuracy
=
scoreForm
[
'accuracy'
]
print
(
'socre'
)
print
(
score
)
print
(
accuracy
)
ret
=
Data
.
find_slice_id
(
data_id
)
if
ret
.
code
==
0
:
...
...
@@ -218,7 +214,8 @@ def grade():
User
.
add_image_score
(
userId
,
score
)
ret
=
Relation
.
set_grade
(
userId
,
slice_id
,
data_id
,
score
)
print
(
ret
.
code
)
taskid
=
Slice
.
find_task_by_slice
(
slice_id
)
Task
.
set_state
(
taskid
,
'check'
)
res
=
{
'code'
:
ret
.
code
,
'message'
:
ret
.
message
,
...
...
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