add

search/utils/group.py

@@ -255,25 +255,10 @@ class GroupUtils(object):
             }
             q["sort"] = [
                 {
-                    "latest_real_reply_time": {
+                    "real_user_activate_time": {
                         "order": "desc"
                     }
                 },
-                {
-                    "latest_real_topic_time": {
-                        "order": "desc"
-                    }
-                },
-                # {
-                #     "_script": {
-                #         "type": "number",
-                #         "script": {
-                #             "lang": "expression",
-                #             "source": "_score+doc['offline_score']"
-                #         },
-                #         "order": "desc"
-                #     }
-                # },
                 {
                     "_score": {
                         "order": "desc"

trans2es/mapping/pictorial.json

@@ -22,8 +22,8 @@
     "is_cover":{"type":"boolean"},
     "topic_vote_number":{"type":"long"},
     "latest_real_reply_time":{"type":"date", "format":"date_time_no_millis"},
-    "latest_real_topic_time":{"type":"date", "format":"date_time_no_millis"}
-
+    "latest_real_topic_time":{"type":"date", "format":"date_time_no_millis"},
+    "real_user_activate_time":{"type":"date", "format":"date_time_no_millis"}
 
   }
 }

trans2es/models/pictorial.py

@@ -181,7 +181,8 @@ class Pictorial(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']).values('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'])
@@ -229,6 +230,51 @@ class Pictorial(models.Model):
         except:
             return datetime.datetime(1980, 1, 1, 0, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
 
+    def get_real_user_activate_time(self):
+        try:
+            reply_query_results = Reply.objects.using(settings.SLAVE_DB_NAME).filter(pictorial_id=self.id, is_deleted=0,
+                                                                                     is_online=1).values("user_id",
+                                                                                                         "create_time")
+            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']).values('is_shadow')
+                    if UserExtra_results.count() > 0:
+                        if not UserExtra_results[0]['is_shadow']:
+                            datetime_list.append(reply['create_time'])
+                    else:
+                        datetime_list.append(reply['create_time'])
+
+            topic_id_list = list(
+                PictorialTopics.objects.filter(pictorial_id=self.id, is_online=True, is_deleted=False).values_list(
+                    "topic_id", flat=True))
+
+            topic_info = Topic.objects.filter(id__in=topic_id_list).values("user_id", "create_time")
+
+            if topic_info.count() > 0:
+                for topic in topic_info:
+                    UserExtra_results = UserExtra.objects.using(settings.SLAVE_DB_NAME).filter(
+                        user_id=topic['user_id']).values('is_shadow')
+                    if UserExtra_results.count() > 0:
+                        if not UserExtra_results[0]['is_shadow']:
+                            datetime_list.append(topic['create_time'])
+                    else:
+                        datetime_list.append(topic['create_time'])
+
+            logging.info("get  datetime_list:%s" % datetime_list)
+
+            if len(datetime_list) > 0:
+                dt = max(datetime_list)
+                logging.info("get  max  datetime_list:%s" % dt)
+                return datetime.datetime(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second,
+                                     tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
+
+            else:
+                return datetime.datetime(1980, 1, 1, 0, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
+        except:
+            return datetime.datetime(1980, 1, 1, 0, 0, 0, tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
+
 
 class PictorialTag(models.Model):
     """画报关注标签"""

trans2es/utils/pictorial_transfer.py

@@ -72,7 +72,7 @@ class PictorialTransfer(object):
             res["activity_join"] = instance.get_activity_join()
             res["latest_real_reply_time"] = instance.get_latest_real_reply_time()
             res["latest_real_topic_time"] = instance.get_latest_real_topic_time()
-
+            res["real_user_activate_time"] = instance.get_real_user_activate_time()
             logging.info("get data:%s" % res)
             return res
         except: