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
alpha
physical
Commits
d627a6e9
Commit
d627a6e9
authored
Apr 04, 2019
by
段英荣
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test
parents
ba594583
77250083
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
275 additions
and
128 deletions
+275
-128
workspace.xml
.idea/workspace.xml
+195
-125
topic.py
search/utils/topic.py
+12
-0
group.py
search/views/group.py
+42
-3
topic-v1.json
trans2es/mapping/topic-v1.json
+2
-0
topic.json
trans2es/mapping/topic.json
+1
-0
topic.py
trans2es/models/topic.py
+21
-0
topic_transfer.py
trans2es/utils/topic_transfer.py
+2
-0
No files found.
.idea/workspace.xml
View file @
d627a6e9
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"
d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e
"
name=
"Default Changelist"
comment=
""
>
<list
default=
"true"
id=
"
51c70d7e-a00b-4e4e-8cbb-f80f5801da99
"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
<option
name=
"HIGHLIGHT_NON_ACTIVE_CHANGELIST"
value=
"false"
/>
<option
name=
"LAST_RESOLUTION"
value=
"IGNORE"
/>
</component>
<component
name=
"FUSProjectUsageTrigger"
>
<session
id=
"-127591351"
>
<usages-collector
id=
"statistics.lifecycle.project"
>
<counts>
<entry
key=
"project.open.time.1"
value=
"1"
/>
<entry
key=
"project.opened"
value=
"1"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.extensions.open"
>
<counts>
<entry
key=
"py"
value=
"5"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.types.open"
>
<counts>
<entry
key=
"Python"
value=
"5"
/>
</counts>
</usages-collector>
<session
id=
"-609148713"
>
<usages-collector
id=
"statistics.file.extensions.edit"
>
<counts>
<entry
key=
"py"
value=
"28"
/>
<entry
key=
"json"
value=
"4"
/>
<entry
key=
"py"
value=
"232"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.types.edit"
>
<counts>
<entry
key=
"Python"
value=
"28"
/>
<entry
key=
"JSON"
value=
"4"
/>
<entry
key=
"Python"
value=
"232"
/>
</counts>
</usages-collector>
</session>
<session
id=
"1569122105"
>
<usages-collector
id=
"statistics.file.extensions.open"
>
<counts>
<entry
key=
"py"
value=
"2"
/>
<entry
key=
"template"
value=
"1"
/>
<entry
key=
"xml"
value=
"1"
/>
</counts>
</usages-collector>
<usages-collector
id=
"statistics.file.types.open"
>
<counts>
<entry
key=
"PLAIN_TEXT"
value=
"1"
/>
<entry
key=
"Python"
value=
"2"
/>
<entry
key=
"XML"
value=
"1"
/>
</counts>
</usages-collector>
</session>
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<leaf>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/mapping/topic.json"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"765"
>
<caret
line=
"51"
column=
"5"
lean-forward=
"true"
selection-start-line=
"51"
selection-start-column=
"5"
selection-end-line=
"51"
selection-end-column=
"5"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/type_info.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"243"
>
<caret
line=
"311"
column=
"45"
selection-start-line=
"311"
selection-start-column=
"45"
selection-end-line=
"311"
selection-end-column=
"45"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/mapping/topic-v1.json"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"427"
>
<caret
line=
"52"
lean-forward=
"true"
selection-start-line=
"52"
selection-end-line=
"52"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/models/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1240"
>
<caret
line=
"260"
column=
"20"
selection-start-line=
"260"
selection-start-column=
"4"
selection-end-line=
"260"
selection-end-column=
"20"
/>
<folding>
<element
signature=
"e#46#118#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/models/user.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"142"
>
<caret
line=
"140"
column=
"1"
lean-forward=
"true"
selection-start-line=
"140"
selection-start-column=
"1"
selection-end-line=
"140"
selection-end-column=
"1"
/>
<folding>
<element
signature=
"e#47#79#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/search/views/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"209"
>
<caret
line=
"85"
column=
"46"
selection-start-line=
"85"
selection-start-column=
"46"
selection-end-line=
"85"
selection-end-column=
"46"
/>
<state
relative-caret-position=
"-110"
>
<caret
line=
"331"
column=
"30"
lean-forward=
"true"
selection-start-line=
"331"
selection-start-column=
"30"
selection-end-line=
"331"
selection-end-column=
"30"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/search/views/group.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"235"
column=
"44"
lean-forward=
"true"
selection-start-line=
"235"
selection-start-column=
"44"
selection-end-line=
"235"
selection-end-column=
"44"
/>
<folding>
<element
signature=
"e#463#1573#0"
/>
<element
signature=
"e#6049#6240#0"
/>
<element
signature=
"e#7051#7614#0"
/>
<element
signature=
"e#8492#10033#0"
/>
<element
signature=
"e#10162#10820#0"
/>
<element
signature=
"e#10934#11363#0"
/>
<element
signature=
"e#1055#3127#0"
/>
</folding>
</state>
</provider>
...
...
@@ -78,54 +112,61 @@
<file
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/search/utils/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
1760
"
>
<caret
line=
"
293"
column=
"66"
selection-start-line=
"293"
selection-start-column=
"66"
selection-end-line=
"293"
selection-end-column=
"66
"
/>
<state
relative-caret-position=
"
-12
"
>
<caret
line=
"
800"
column=
"8"
selection-start-line=
"800"
selection-start-column=
"8"
selection-end-line=
"800"
selection-end-column=
"8
"
/>
<folding>
<element
signature=
"e#47#61#0"
expanded=
"true"
/>
<element
signature=
"e#363#1043#0"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/utils/topic_transfer.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"111"
>
<caret
line=
"65"
column=
"5"
selection-start-line=
"65"
selection-start-column=
"5"
selection-end-line=
"65"
selection-end-column=
"5"
/>
</state>
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/search/views/business_topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"147"
>
<caret
line=
"21"
column=
"38"
selection-start-line=
"21"
selection-start-column=
"38"
selection-end-line=
"21"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FindInProjectRecents"
>
<findStrings>
<find>
BaseModel
</find>
<find>
physical/search/topic
</find>
<find>
physical/search/query_tag_id_by_topic
</find>
<find>
get filters
</find>
<find>
HEAD
</find>
<find>
physical/search/business/topic
</find>
</findStrings>
</component>
<component
name=
"Git.Settings"
>
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$"
/>
</component>
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py"
/>
<option
value=
"$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py"
/>
<option
value=
"$PROJECT_DIR$/search/views/topic.py"
/>
<option
value=
"$PROJECT_DIR$/search/utils/topic.py"
/>
<option
value=
"$PROJECT_DIR$/physical/settings.py"
/>
<option
value=
"$PROJECT_DIR$/trans2es/mapping/topic-v1.json"
/>
<option
value=
"$PROJECT_DIR$/trans2es/models/topic.py"
/>
<option
value=
"$PROJECT_DIR$/search/views/group.py"
/>
</list>
</option>
</component>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"279"
/>
<option
name=
"y"
value=
"23"
/>
<option
name=
"width"
value=
"1280"
/>
<option
name=
"height"
value=
"738"
/>
</component>
<component
name=
"ProjectInspectionProfilesVisibleTreeState"
>
<entry
key=
"Project Default"
>
<profile-state>
<expanded-state>
<State
/>
<State>
<id>
General
</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>
Buildout
</id>
</State>
</selected-state>
</profile-state>
</entry>
<option
name=
"height"
value=
"724"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
proportions=
""
version=
"1"
>
...
...
@@ -143,29 +184,28 @@
<path>
<item
name=
"physical"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"physical"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"
linucb
"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"
search
"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"physical"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"physical"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"physical"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"search"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"views"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"physical"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"physical"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"search"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"External Libraries"
type=
"cb654da1:ExternalLibrariesNode"
/>
</path>
<path>
<item
name=
"physical"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"physical"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"search"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"utils"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"External Libraries"
type=
"cb654da1:ExternalLibrariesNode"
/>
<item
name=
"< Python 3.6 (venv) >"
type=
"70bed36:NamedLibraryElementNode"
/>
</path>
<path>
<item
name=
"physical"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"
physical"
type=
"462c0819:PsiDirectory
Node"
/>
<item
name=
"
search"
type=
"462c0819:PsiDirectory
Node"
/>
<item
name=
"
views"
type=
"462c0819:PsiDirectory
Node"
/>
<item
name=
"
External Libraries"
type=
"cb654da1:ExternalLibraries
Node"
/>
<item
name=
"
< Python 3.6 (venv) >"
type=
"70bed36:NamedLibraryElement
Node"
/>
<item
name=
"
python-skeletons"
type=
"51189727:PyUserSkeletons
Node"
/>
</path>
</expand>
<select
/>
...
...
@@ -173,15 +213,6 @@
</pane>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
/>
</component>
<component
name=
"RecentsManager"
>
<key
name=
"MoveFile.RECENT_KEYS"
>
<recent
name=
"$PROJECT_DIR$/search/views"
/>
</key>
</component>
<component
name=
"RunDashboard"
>
<option
name=
"ruleStates"
>
<list>
...
...
@@ -208,9 +239,9 @@
<servers
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"0"
y=
"23"
width=
"1280"
height=
"724"
extended-state=
"
6
"
/>
<frame
x=
"0"
y=
"23"
width=
"1280"
height=
"724"
extended-state=
"
0
"
/>
<layout>
<window_info
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.2
2160445
"
/>
<window_info
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.2
494043
"
/>
<window_info
id=
"Structure"
order=
"1"
side_tool=
"true"
weight=
"0.25"
/>
<window_info
id=
"DB Browser"
order=
"2"
/>
<window_info
id=
"Favorites"
order=
"3"
side_tool=
"true"
/>
...
...
@@ -223,17 +254,14 @@
<window_info
anchor=
"bottom"
id=
"TODO"
order=
"6"
/>
<window_info
anchor=
"bottom"
id=
"Version Control"
order=
"7"
show_stripe_button=
"false"
/>
<window_info
anchor=
"bottom"
id=
"DB Execution Console"
order=
"8"
/>
<window_info
active=
"true"
anchor=
"bottom"
id=
"Terminal"
order=
"9"
visible=
"true"
weight=
"0.44663382
"
/>
<window_info
active=
"true"
anchor=
"bottom"
id=
"Terminal"
order=
"9"
sideWeight=
"0.49960285"
visible=
"true"
weight=
"0.4499179
"
/>
<window_info
anchor=
"bottom"
id=
"Python Console"
order=
"10"
/>
<window_info
anchor=
"bottom"
id=
"Event Log"
order=
"11"
side
_tool=
"true
"
/>
<window_info
anchor=
"bottom"
id=
"Event Log"
order=
"11"
side
Weight=
"0.50039715"
side_tool=
"true"
weight=
"0.03284072
"
/>
<window_info
anchor=
"right"
id=
"Commander"
internal_type=
"SLIDING"
order=
"0"
type=
"SLIDING"
weight=
"0.4"
/>
<window_info
anchor=
"right"
id=
"Ant Build"
order=
"1"
weight=
"0.25"
/>
<window_info
anchor=
"right"
content_ui=
"combo"
id=
"Hierarchy"
order=
"2"
weight=
"0.25"
/>
</layout>
</component>
<component
name=
"VcsContentAnnotationSettings"
>
<option
name=
"myLimit"
value=
"2678400000"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/trans2es/models/face_user_contrast_similar.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -249,17 +277,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/search/utils/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1760"
>
<caret
line=
"293"
column=
"66"
selection-start-line=
"293"
selection-start-column=
"66"
selection-end-line=
"293"
selection-end-column=
"66"
/>
<folding>
<element
signature=
"e#47#61#0"
expanded=
"true"
/>
<element
signature=
"e#363#1043#0"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app_conf.xml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
...
...
@@ -271,42 +288,94 @@
<entry
file=
"file://$PROJECT_DIR$/search/views/contrast_similar.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
<entry
file=
"file://$PROJECT_DIR$/physical/settings.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-2448"
>
<caret
line=
"12"
column=
"9"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"9"
selection-end-line=
"12"
selection-end-column=
"9"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/trans2es/mapping/topic.json"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"765"
>
<caret
line=
"51"
column=
"5"
lean-forward=
"true"
selection-start-line=
"51"
selection-start-column=
"5"
selection-end-line=
"51"
selection-end-column=
"5"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/search/views/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"209"
>
<caret
line=
"85"
column=
"46"
selection-start-line=
"85"
selection-start-column=
"46"
selection-end-line=
"85"
selection-end-column=
"46"
/>
<state
relative-caret-position=
"-110"
>
<caret
line=
"331"
column=
"30"
lean-forward=
"true"
selection-start-line=
"331"
selection-start-column=
"30"
selection-end-line=
"331"
selection-end-column=
"30"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/search/views/group.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"235"
column=
"44"
lean-forward=
"true"
selection-start-line=
"235"
selection-start-column=
"44"
selection-end-line=
"235"
selection-end-column=
"44"
/>
<folding>
<element
signature=
"e#463#1573#0"
/>
<element
signature=
"e#6049#6240#0"
/>
<element
signature=
"e#7051#7614#0"
/>
<element
signature=
"e#8492#10033#0"
/>
<element
signature=
"e#10162#10820#0"
/>
<element
signature=
"e#10934#11363#0"
/>
<element
signature=
"e#1055#3127#0"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
physical/settings.py
"
>
<entry
file=
"file://$PROJECT_DIR$/
trans2es/mapping/topic-v1.json
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-2448
"
>
<caret
line=
"
12"
column=
"9"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"9"
selection-end-line=
"12"
selection-end-column=
"9
"
/>
<state
relative-caret-position=
"
427
"
>
<caret
line=
"
52"
lean-forward=
"true"
selection-start-line=
"52"
selection-end-line=
"52
"
/>
</state>
</provider>
</entry>
</component>
<component
name=
"masterDetails"
>
<states>
<state
key=
"ScopeChooserConfigurable.UI"
>
<settings>
<splitter-proportions>
<option
name=
"proportions"
>
<list>
<option
value=
"0.2"
/>
</list>
</option>
</splitter-proportions>
</settings>
<entry
file=
"file://$PROJECT_DIR$/trans2es/models/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1240"
>
<caret
line=
"260"
column=
"20"
selection-start-line=
"260"
selection-start-column=
"4"
selection-end-line=
"260"
selection-end-column=
"20"
/>
<folding>
<element
signature=
"e#46#118#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/trans2es/models/user.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"142"
>
<caret
line=
"140"
column=
"1"
lean-forward=
"true"
selection-start-line=
"140"
selection-start-column=
"1"
selection-end-line=
"140"
selection-end-column=
"1"
/>
<folding>
<element
signature=
"e#47#79#0"
expanded=
"true"
/>
</folding>
</state>
</states>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/trans2es/type_info.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"243"
>
<caret
line=
"311"
column=
"45"
selection-start-line=
"311"
selection-start-column=
"45"
selection-end-line=
"311"
selection-end-column=
"45"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/trans2es/utils/topic_transfer.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"111"
>
<caret
line=
"65"
column=
"5"
selection-start-line=
"65"
selection-start-column=
"5"
selection-end-line=
"65"
selection-end-column=
"5"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/search/views/business_topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"147"
>
<caret
line=
"21"
column=
"38"
selection-start-line=
"21"
selection-start-column=
"38"
selection-end-line=
"21"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/search/utils/topic.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-12"
>
<caret
line=
"800"
column=
"8"
selection-start-line=
"800"
selection-start-column=
"8"
selection-end-line=
"800"
selection-end-column=
"8"
/>
<folding>
<element
signature=
"e#47#61#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
search/utils/topic.py
View file @
d627a6e9
...
...
@@ -747,6 +747,18 @@ class TopicUtils(object):
"order"
:
"desc"
},
})
elif
sort_by
==
TOPIC_SEARCH_SORT
.
VOTE_NUM_AEC
:
sort_rule
.
append
({
"total_vote_num"
:
{
"order"
:
"asc"
},
})
elif
sort_by
==
TOPIC_SEARCH_SORT
.
VOTE_NUM_DESC
:
sort_rule
.
append
({
"total_vote_num"
:
{
"order"
:
"desc"
},
})
return
sort_rule
...
...
search/views/group.py
View file @
d627a6e9
...
...
@@ -92,8 +92,6 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
:return:
"""
try
:
if
not
isinstance
(
topic_id
,
int
):
user_id
=
-
1
# 获取es链接对象
es_cli_obj
=
ESPerform
.
get_cli
()
...
...
@@ -167,7 +165,7 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
"term"
:
{
"is_online"
:
True
}
},{
},
{
"term"
:
{
"is_deleted"
:
False
}
...
...
@@ -202,3 +200,44 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
except
:
logging
.
error
(
"catch exception,err_msg:
%
s"
%
traceback
.
format_exc
())
return
{
"pictorial_ids_list"
:
[]}
@bind
(
"physical/search/pictorial_topic_sort"
)
def
pictorial_topic_sort
(
pictorial_id
=-
1
,
offset
=
0
,
size
=
10
):
"""
:remark 小组排序,缺少:前1天发评论人数*x
:param user_id:
:param sort_type:
:param offset:
:param size:
:return:
"""
try
:
if
not
isinstance
(
pictorial_id
,
int
):
user_id
=
-
1
q
=
{
"query"
:{
"term"
:{
"pictorial_id"
:
pictorial_id
}
},
"sort"
:{
"vote_num"
:{
"order"
:
"desc"
}
}
}
pict_pictorial_ids_list
=
[]
# 获取es链接对象
es_cli_obj
=
ESPerform
.
get_cli
()
result_dict
=
ESPerform
.
get_search_results
(
es_cli_obj
,
"topic"
,
q
,
offset
,
size
)
logging
.
info
(
"get pictorial_topic_sort res:
%
s"
%
result_dict
)
for
item
in
result_dict
[
"hits"
]:
topic_id
=
item
[
"_source"
][
"id"
]
pict_pictorial_ids_list
.
append
(
topic_id
)
return
{
"pict_pictorial_ids_list"
:
pict_pictorial_ids_list
}
except
:
logging
.
error
(
"catch exception,err_msg:
%
s"
%
traceback
.
format_exc
())
return
{
"pict_pictorial_ids_list"
:
[]}
trans2es/mapping/topic-v1.json
View file @
d627a6e9
...
...
@@ -5,12 +5,14 @@
"is_online"
:{
"type"
:
"boolean"
},
//上线
"is_deleted"
:{
"type"
:
"boolean"
},
"vote_num"
:{
"type"
:
"long"
},
"total_vote_num"
:{
"type"
:
"long"
},
"reply_num"
:{
"type"
:
"long"
},
"name"
:{
"type"
:
"text"
,
"analyzer"
:
"gm_default_index"
,
"search_analyzer"
:
"gm_default_index"
},
"description"
:{
"type"
:
"text"
,
"analyzer"
:
"gm_default_index"
,
"search_analyzer"
:
"gm_default_index"
},
"content"
:{
"type"
:
"text"
,
"analyzer"
:
"gm_default_index"
,
"search_analyzer"
:
"gm_default_index"
},
"content_level"
:{
"type"
:
"text"
},
"user_id"
:{
"type"
:
"long"
},
"user_nick_name"
:{
"type"
:
"text"
,
"analyzer"
:
"gm_default_index"
,
"search_analyzer"
:
"gm_default_index"
},
//帖子用户名
"group_id"
:{
"type"
:
"long"
},
//所在组ID
"tag_list"
:{
"type"
:
"long"
},
//标签属性
"edit_tag_list"
:{
"type"
:
"long"
},
//编辑标签
...
...
trans2es/mapping/topic.json
View file @
d627a6e9
...
...
@@ -5,6 +5,7 @@
"is_online"
:{
"type"
:
"boolean"
},
//上线
"is_deleted"
:{
"type"
:
"boolean"
},
"vote_num"
:{
"type"
:
"long"
},
"total_vote_num"
:{
"type"
:
"long"
},
"reply_num"
:{
"type"
:
"long"
},
"name"
:{
"type"
:
"text"
,
"analyzer"
:
"gm_default_index"
,
"search_analyzer"
:
"gm_default_index"
},
"description"
:{
"type"
:
"text"
,
"analyzer"
:
"gm_default_index"
,
"search_analyzer"
:
"gm_default_index"
},
...
...
trans2es/models/topic.py
View file @
d627a6e9
...
...
@@ -82,6 +82,14 @@ class Topic(models.Model):
platform
=
models
.
IntegerField
(
verbose_name
=
u'平台来源'
,
choices
=
GRAP_PLATFORM
,
default
=
GRAP_PLATFORM
.
ALPHA
)
platform_id
=
models
.
BigIntegerField
(
verbose_name
=
'用平台ID'
,
null
=
True
)
def
get_virtual_vote_num
(
self
):
try
:
topic_extra
=
TopicExtra
.
object
.
get
(
topic_id
=
self
.
id
)
return
topic_extra
.
virtual_vote_num
except
:
return
0
def
get_pictorial_id
(
self
):
try
:
pictorial_id_list
=
[]
...
...
@@ -238,3 +246,16 @@ class PictorialTopic(models.Model):
is_online
=
models
.
BooleanField
(
verbose_name
=
u"是否有效"
,
default
=
True
)
is_online
=
models
.
BooleanField
(
verbose_name
=
u'是否上线'
)
is_deleted
=
models
.
BooleanField
(
verbose_name
=
u'是否删除'
)
class
TopicExtra
(
models
.
Model
):
"""帖子相关额外信息"""
class
Meta
:
verbose_name
=
'帖子额外信息'
app_label
=
'community'
db_table
=
'topic_extra'
id
=
models
.
IntegerField
(
verbose_name
=
u'ID'
,
primary_key
=
True
)
topic_id
=
models
.
IntegerField
(
verbose_name
=
u"帖子ID"
,
db_index
=
True
)
virtual_vote_num
=
models
.
IntegerField
(
verbose_name
=
"帖子虚拟点赞"
)
trans2es/utils/topic_transfer.py
View file @
d627a6e9
...
...
@@ -109,6 +109,8 @@ class TopicTransfer(object):
res
[
"update_time"
]
=
tzlc_update_time
res
[
"update_time_val"
]
=
int
(
time
.
mktime
(
tzlc_update_time
.
timetuple
()))
res
[
"total_vote_num"
]
=
instance
.
get_virtual_vote_num
()
+
instance
.
vote_num
logging
.
info
(
"test topic transfer time cost,time0:
%
d,time1:
%
d,time2:
%
d,time3:
%
d,time4:
%
d"
%
(
time0
,
time1
,
time2
,
time3
,
time4
))
return
res
except
:
...
...
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