Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test

libs/es.py

@@ -415,6 +415,7 @@ class ESPerform(object):
                 },
                 "sort": [
                     {"_score": {"order": "desc"}},
+                    {"latest_reply_time":{"order":"desc"}},
                     {"create_time_val": {"order": "desc"}},
                     {"language_type": {"order": "asc"}},
                 ],

trans2es/mapping/topic-star-routing.json

@@ -8,19 +8,19 @@
     "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"},
+    "name":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
+    "description":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
+    "content":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
     "content_level":{"type":"text"},
     "user_id":{"type":"long"},
-    "user_nick_name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},//帖子用户名
+    "user_nick_name":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},//帖子用户名
     "user_nick_name_pre": {"type":"text","analyzer":"keyword"}, //不切词的用户名
     "group_id":{"type":"long"}, //所在组ID
     "tag_list":{"type":"long"},//标签属性
     "useful_tag_list":{"type":"long"},//有用标签属性
     "latest_reply_time":{"type":"date", "format":"date_time_no_millis"},
     "edit_tag_list":{"type":"long"},//编辑标签
-    "tag_name_list":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},
+    "tag_name_list":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
     "share_num":{"type":"long"},
     "pick_id_list":{"type":"long"},
     "offline_score":{"type":"double"},//离线算分
@@ -45,14 +45,14 @@
     "platform": {"type": "long"},
     "platform_id": {"type": "long"},
 
-    "drop_score":{"type": "double"},  // 人工降分
+    "drop_score":{"type": "long"},  // 人工降分
     "sort_score":{"type": "double"},  // 排序分
 
     "pictorial_id":{"type": "long"}, //所在组ID
     "pictorial_name":{  // 所在组名称
         "type": "text",
-        "analyzer": "gm_default_index",
-        "search_analyzer": "gm_default_index"
+        "analyzer": "keyword",
+        "search_analyzer": "keyword"
     },
     "is_excellent":{"type": "long"},
     "is_operation_home_recommend": {"type": "boolean"}, //是否首页运营推荐

trans2es/mapping/topic.json

@@ -8,19 +8,19 @@
     "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"},
+    "name":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
+    "description":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
+    "content":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
     "content_level":{"type":"text"},
     "user_id":{"type":"long"},
-    "user_nick_name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},//帖子用户名
+    "user_nick_name":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},//帖子用户名
     "user_nick_name_pre": {"type":"text","analyzer":"keyword"}, //不切词的用户名
     "group_id":{"type":"long"}, //所在组ID
     "tag_list":{"type":"long"},//标签属性
     "useful_tag_list":{"type":"long"},//有用标签属性
     "latest_reply_time":{"type":"date", "format":"date_time_no_millis"},
     "edit_tag_list":{"type":"long"},//编辑标签
-    "tag_name_list":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},
+    "tag_name_list":{"type":"text","analyzer":"keyword","search_analyzer":"keyword"},
     "share_num":{"type":"long"},
     "pick_id_list":{"type":"long"},
     "offline_score":{"type":"double"},//离线算分
@@ -45,14 +45,14 @@
     "platform": {"type": "long"},
     "platform_id": {"type": "long"},
 
-    "drop_score":{"type": "double"},  // 人工降分
+    "drop_score":{"type": "long"},  // 人工降分
     "sort_score":{"type": "double"},  // 排序分
 
     "pictorial_id":{"type": "long"}, //所在组ID
     "pictorial_name":{  // 所在组名称
         "type": "text",
-        "analyzer": "gm_default_index",
-        "search_analyzer": "gm_default_index"
+        "analyzer": "keyword",
+        "search_analyzer": "keyword"
     },
     "is_excellent":{"type": "long"},
     "is_operation_home_recommend": {"type": "boolean"}, //是否首页运营推荐

trans2es/models/topic.py

@@ -319,14 +319,16 @@ class Topic(models.Model):
             datetime_list = list()
             if reply_query_results.count() > 0:
                 for reply in reply_query_results:
-                    UserExtra_results = UserExtra.objects.using(settings.SLAVE_DB_NAME).filter(user_id=reply['user_id'])
-                    if not UserExtra_results['is_shadow']:
+                    UserExtra_results = UserExtra.objects.using(settings.SLAVE_DB_NAME).filter(user_id=reply['user_id']).values('is_shadow')
+                    if UserExtra_results.count()>0:
+                       if not UserExtra_results[0]['is_shadow']:
                         datetime_list.append(reply['create_time'])
-                return max(datetime_list)
+                dt = max(datetime_list)
+                return datetime.datetime(dt.year,dt.month,dt.day,dt.hour, dt.minute, dt.second,tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
             else:
-                return 0
+                return datetime.datetime(1980,1,1,0,0,0,tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
         except:
-            return 0
+            return datetime.datetime(1980,1,1,0,0,0,tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
 
 
 class TopicComplaint(models.Model):