Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
physical
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
钟尚武
physical
Commits
c962e7b0
Commit
c962e7b0
authored
Mar 23, 2019
by
lixiaofang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add
parent
2c6284cc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
16 deletions
+0
-16
topic.py
search/utils/topic.py
+0
-7
pictorial.py
trans2es/models/pictorial.py
+0
-9
No files found.
search/utils/topic.py
View file @
c962e7b0
...
...
@@ -34,8 +34,6 @@ class TopicUtils(object):
q
[
"_source"
]
=
{
"include"
:
[
"tag_list"
,
"attention_user_id_list"
,
"pick_user_id_list"
,
"same_pictorial_user_id_list"
]
}
logging
.
info
(
"get query-------:
%
s"
%
q
)
result_dict
=
ESPerform
.
get_search_results
(
ESPerform
.
get_cli
(),
"user"
,
q
,
offset
,
size
)
return
result_dict
...
...
@@ -152,19 +150,16 @@ class TopicUtils(object):
pick_user_info_list
=
result_dict
[
"hits"
][
0
][
"_source"
][
"pick_user_id_list"
]
pick_user_id_list
=
[
item
[
"user_id"
]
for
item
in
pick_user_info_list
]
logging
.
info
(
"get result_dict_hits :
%
s"
%
result_dict
[
"hits"
])
# same_group_user_info_list = result_dict["hits"][0]["_source"]["same_group_user_id_list"]
# same_group_id_list = [item["user_id"] for item in same_group_user_info_list]
# same_group_id_list = same_group_id_list[:100]
same_pictorial_user_info_list
=
result_dict
[
"hits"
][
0
][
"_source"
][
"same_pictorial_user_id_list"
]
logging
.
info
(
"get same_pictorial_user_info_list :
%
s"
%
same_pictorial_user_info_list
)
same_pictorial_id_list
=
[
item
[
"user_id"
]
for
item
in
same_pictorial_user_info_list
]
same_pictorial_id_list
=
same_pictorial_id_list
[:
100
]
user_tag_list
=
result_dict
[
"hits"
][
0
][
"_source"
][
"tag_list"
]
logging
.
info
(
"get same_pictorial_id_list :
%
s"
%
same_pictorial_id_list
)
q
=
dict
()
q
[
"query"
]
=
dict
()
...
...
@@ -726,14 +721,12 @@ class TopicUtils(object):
if
sorts
:
q
[
"sort"
]
=
sorts
logging
.
info
(
"get query:
%
s"
%
q
)
try
:
result_dict
=
ESPerform
.
get_search_results
(
ESPerform
.
get_cli
(),
sub_index_name
=
index_name
,
query_body
=
q
,
offset
=
offset
,
size
=
size
)
logging
.
info
(
"get result_dicts:
%
s"
%
result_dict
)
return
{
"hits"
:
result_dict
[
"hits"
],
...
...
trans2es/models/pictorial.py
View file @
c962e7b0
...
...
@@ -81,13 +81,9 @@ class Pictorial(models.Model):
topic_id_list
=
PictorialTopics
.
objects
.
filter
(
pictorial_id
=
self
.
id
)
.
values_list
(
"topic_id"
,
flat
=
True
)
logging
.
info
(
"get topic_id_list:
%
s"
%
topic_id_list
)
topic_num
=
Topic
.
objects
.
filter
(
content_level__in
=
[
"4"
,
"5"
],
create_time__gte
=
yesterday_begin_time
,
create_time__lte
=
yesterday_end_time
,
id__in
=
topic_id_list
)
.
count
()
logging
.
info
(
"get topic_num:
%
s"
%
topic_num
)
return
topic_num
except
:
...
...
@@ -98,9 +94,7 @@ class Pictorial(models.Model):
try
:
tag_id_list
=
[]
tags
=
PictorialTag
.
objects
.
filter
(
pictorial_id
=
self
.
id
,
is_online
=
True
)
.
values_list
(
"tag_id"
,
flat
=
True
)
logging
.
info
(
"get tags:
%
s"
%
tags
)
for
i
in
tags
:
logging
.
info
(
"get tags i:
%
s"
%
i
)
tag_id_list
.
append
(
i
)
return
tag_id_list
...
...
@@ -112,10 +106,7 @@ class Pictorial(models.Model):
def
get_tag_by_name
(
self
,
tag_id
):
try
:
tag_name_list
=
[]
logging
.
info
(
"get tag_id:
%
s"
%
tag_id
)
tags
=
Tag
.
objects
.
filter
(
id__in
=
tag_id
,
is_online
=
True
)
.
values_list
(
"name"
,
flat
=
True
)
logging
.
info
(
"get tags name :
%
s"
%
tags
)
for
i
in
tags
:
tag_name_list
.
append
(
i
)
logging
.
info
(
"get tags name i:
%
s"
%
i
)
...
...
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