Merge branch 'test' into 'wsy2'

# Conflicts:
#   README.md

README.md

@@ -55,8 +55,10 @@ celery -A physical beat
 
 ### physical策略端脚本
 在Alp-Test-Cos-test001服务器上，通过crontab -l查看
+<<<<<<< README.md
 
 更新脚本
 ```bash
 make crontab
 ```
+

search/utils/topic.py

@@ -1339,7 +1339,19 @@ class TopicUtils(object):
                             }
                         }
                     })
+            elif k == "is_kol":
+                f.append({
+                    "term": {
+                        "user_is_kol": True
+                    }
+                })
 
+            elif k == "is_edit":
+                f.append({
+                    "term": {
+                        "user_is_edit": True
+                    }
+                })
             # elif k == "pictorial_id":
             #     f.append({
             #         "nested": {

search/views/tag.py

@@ -16,6 +16,7 @@ from trans2es.models.tag import CommunityTagSetRelation
 from django.conf import settings
 from libs.error import logging_exception
 from django.db import connection
+from trans2es.models.account_reg_extra import AccountRegExtra
 
 
 def get_highlight(fields=[]):
@@ -143,6 +144,27 @@ def choice_pictorial_push_tag(device_id, user_id):
         return {"pictorial_tag_list": []}
 
 
+@bind("physical/search/lintag_by_user_id")
+def get_lintags_by_user_id(user_id):
+    try:
+        devices = AccountRegExtra.objects.filter(user_id=user_id, is_online=True, is_deleted=False).values_list("device_id", flat=True)
+        if devices:
+            linucb_recommend_redis_prefix = "physical:linucb:tag_recommend:device_id:"
+            device_id = devices[0]
+            redis_key = linucb_recommend_redis_prefix + str(device_id)
+            tag_data = redis_client.get(redis_key)
+            lintags = []
+            if tag_data is None:
+                lintags = []
+            else:
+                lintags = json.loads(str(tag_data, encoding="utf-8"))
+            return {"lin_tag_list": lintags[:3]}
+        return {"lin_tag_list": []}
+    except Exception as e:
+        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+        return {"lin_tag_list": []}
+
+
 @bind("physical/search/choice_push_tag")
 def choice_push_tag(device_id, user_id):
     """

trans2es/models/__init__.py

@@ -14,3 +14,5 @@ from .user import User
 from .group import Group
 from .pictorial import PictorialFollow
 from .pictorial import Pictorial
+
+from .account_reg_extra import AccountRegExtra

trans2es/models/account_reg_extra.py

+import datetime
+
+from django.db import models
+
+
+class AccountRegExtra(models.Model):
+    class Meta:
+        verbose_name = u"设备用户关系表"
+        db_table = "account_reg_extra"
+
+    id = models.IntegerField(verbose_name="主键ID", primary_key=True)
+    is_online = models.BooleanField(verbose_name=u"是否上线")
+    create_time = models.DateTimeField(verbose_name=u"创建时间", default=datetime.datetime.fromtimestamp(0))
+    update_time = models.DateTimeField(verbose_name=u"更新时间", default=datetime.datetime.fromtimestamp(0))
+    is_deleted = models.BooleanField(verbose_name=u"")
+    geo = models.CharField(verbose_name=u"", max_length=300)
+    model = models.CharField(verbose_name=u"", max_length=64)
+    device_id = models.CharField(verbose_name=u"设备ID", max_length=64)
+    share_code = models.CharField(verbose_name=u"", max_length=64)
+    user_id = models.IntegerField(verbose_name="用户ID")