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
56ec950d
Commit
56ec950d
authored
Aug 19, 2019
by
段英荣
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic_update_time' into 'master'
update_time See merge request
alpha/physical!421
parents
32ce60d1
978b0c8e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
trans2es_mapping2es.py
trans2es/management/commands/trans2es_mapping2es.py
+1
-2
principal_online_comment1.py
vest/pictorial/principal_online_comment1.py
+1
-1
No files found.
trans2es/management/commands/trans2es_mapping2es.py
View file @
56ec950d
...
...
@@ -7,7 +7,7 @@ import traceback
import
logging
from
libs.es
import
ESPerform
from
trans2es.type_info
import
get_type_info_map
,
TypeInfo
from
vest.reply
import
true_comment_one
,
true_comment_two
,
true_comment_three
,
one_seven_topic_comment
from
vest.reply
import
true_comment_one
,
true_comment_two
,
true_comment_three
,
one_seven_topic_comment
from
vest.click
import
true_click_five
,
true_click_two
,
true_click_four
,
true_click_one
,
true_click_three
,
\
one_seven_star_topic
from
vest.follow
import
auto_follow
,
auto_follow_new
...
...
@@ -143,6 +143,5 @@ class Command(BaseCommand):
if
options
[
"mvest"
]
==
"principal_online_comment1"
:
principal_online_comment1
.
principal_online_comment1
()
except
:
logging
.
error
(
"catch exception,err_msg:
%
s"
%
traceback
.
format_exc
())
vest/pictorial/principal_online_comment1.py
View file @
56ec950d
...
...
@@ -39,7 +39,7 @@ def get_data(numtime1, numtime2):
numtime1
,
numtime2
))
data
=
cursor
.
fetchall
()
cursor
.
execute
(
"SELECT pictorial_id FROM topic_vote_cnt WHERE is_deleted = 0 and (
create_time >= '
%
s' and cre
ate_time < '
%
s') group by pictorial_id"
%
(
"SELECT pictorial_id FROM topic_vote_cnt WHERE is_deleted = 0 and (
update_time >= '
%
s' and upd
ate_time < '
%
s') group by pictorial_id"
%
(
numtime1
,
numtime2
))
data_vote
=
cursor
.
fetchall
()
...
...
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