Skip to content

C
cybertron
Commit b4fc9efc authored by lixiaofang's avatar lixiaofang
Browse files
Options

pictorial

parent 626e3f7a
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 24 deletions
.idea/workspace.xml
View file @ b4fc9efc
......@@ -17,26 +17,26 @@
<entry key="README" value="1" />
<entry key="batch_user_gen" value="1" />
<entry key="guanshui" value="1" />
<entry key="py" value="51" />
<entry key="py" value="52" />
<entry key="txt" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="PLAIN_TEXT" value="8" />
<entry key="Python" value="51" />
<entry key="Python" value="52" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="dummy" value="1" />
<entry key="py" value="2456" />
<entry key="py" value="2472" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="2456" />
<entry key="Python" value="2472" />
</counts>
</usages-collector>
<usages-collector id="statistics.lifecycle.project">
......@@ -55,8 +55,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/auto_request.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="48" column="4" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="4" />
<state relative-caret-position="186">
<caret line="190" column="4" selection-start-line="190" selection-start-column="4" selection-end-line="190" selection-end-column="4" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1565244598000" expanded="true" signature="6010:6334" ph="..." />
......@@ -68,8 +68,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/principal_online_comment1.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="88" column="57" lean-forward="true" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
<state relative-caret-position="234">
<caret line="38" column="143" lean-forward="true" selection-start-line="38" selection-start-column="143" selection-end-line="38" selection-end-column="143" />
<folding>
<element signature="e#0#14#0" expanded="true" />
</folding>
......@@ -89,6 +89,15 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/answer_reply2.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -135,11 +144,11 @@
<option value="$PROJECT_DIR$/answer_reply1.py" />
<option value="$PROJECT_DIR$/reply_comment2.py" />
<option value="$PROJECT_DIR$/answer_reply3.py" />
<option value="$PROJECT_DIR$/answer_reply2.py" />
<option value="$PROJECT_DIR$/reply_comment3.py" />
<option value="$PROJECT_DIR$/pictorial_reply_data.txt" />
<option value="$PROJECT_DIR$/principal_offline_comment1.py" />
<option value="$PROJECT_DIR$/auto_request.py" />
<option value="$PROJECT_DIR$/answer_reply2.py" />
<option value="$PROJECT_DIR$/principal_online_comment1.py" />
</list>
</option>
......@@ -223,7 +232,8 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="27" width="1280" height="727" extended-state="6" />
<frame x="0" y="23" width="1280" height="727" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Structure" order="0" sideWeight="0.21188119" side_tool="true" weight="0.19112115" />
<window_info id="Favorites" order="1" side_tool="true" />
......@@ -237,7 +247,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.4988086" visible="true" weight="0.65849674" />
<window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.4988086" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50119144" side_tool="true" weight="0.32843137" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="DB Execution Console" order="11" />
......@@ -473,13 +483,6 @@
<entry file="file://$PROJECT_DIR$/batch_user_gen">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/answer_reply2.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="764">
<caret line="52" column="43" selection-start-line="52" selection-start-column="43" selection-end-line="52" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/reply_comment1.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
......@@ -541,10 +544,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/answer_reply2.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/auto_request.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="48" column="4" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="4" />
<state relative-caret-position="186">
<caret line="190" column="4" selection-start-line="190" selection-start-column="4" selection-end-line="190" selection-end-column="4" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1565244598000" expanded="true" signature="6010:6334" ph="..." />
......@@ -554,8 +564,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/principal_online_comment1.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="88" column="57" lean-forward="true" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
<state relative-caret-position="234">
<caret line="38" column="143" lean-forward="true" selection-start-line="38" selection-start-column="143" selection-end-line="38" selection-end-column="143" />
<folding>
<element signature="e#0#14#0" expanded="true" />
</folding>
......
principal_online_comment1.py
View file @ b4fc9efc
......@@ -36,11 +36,11 @@ def get_data(numtime1, numtime2):
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor()
cursor.execute(
"SELECT pictorial_id ,count(*) as count FROM community_pictorial_topic WHERE is_online=1 and create_time > '%s' and create_time < '%s' group by pictorial_id )" % (
"SELECT pictorial_id ,count(*) as count FROM community_pictorial_topic WHERE is_online=1 and (create_time >= '%s' and create_time < '%s') group by pictorial_id " % (
numtime1, numtime2))
data = cursor.fetchall()
cursor.execute(
"SELECT pictorial_id FROM topic_vote_cnt WHERE is_deleted = 0 and (create_time > '%s' and create_time < '%s' group by pictorial_id )" % (
"SELECT pictorial_id FROM topic_vote_cnt WHERE is_deleted = 0 and (create_time >= '%s' and create_time < '%s') group by pictorial_id" % (
numtime1, numtime2))
data_vote = cursor.fetchall()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment