判断类型

associate/models/agile_tag.py

@@ -48,10 +48,9 @@ class AgileTagType(BaseModel):
     @property
     def get_by_id_name(self):
         try:
-            logging.info("get self.id:%s"%self.agile_tag_id)
-            results =AgileTag.objects.filter(id=self.agile_tag_id).values().first()
-            if results :
-
+            logging.info("get self.id:%s" % self.agile_tag_id)
+            results = AgileTag.objects.filter(id=self.agile_tag_id).values().first()
+            if results:
                 return results
             else:
                 return {}

associate/search/utils/auto_tips.py

@@ -52,15 +52,30 @@ def get_suggest_tips(query, agile_tag_type):
             for tips_item in result_dicts["hits"]["hits"]:
                 agile_type_id.add(tips_item["_source"]["agile_tag_id"])
 
-        logging.info("get agile_type_id:%s" % agile_type_id)
-        # 获取这个类型
+            logging.info("get agile_type_id:%s" % agile_type_id)
+            # 获取这个类型
 
-        logging.info("get result_dict:%s" % result_dict)
-        for tips_item in result_dict["suggest"]["tips-suggest"]:
-            for hit_item in tips_item["options"]:
-                if hit_item["_source"]["ori_name"] not in have_read_tips_set:
-                    agile_tag_id = hit_item["_source"]["agile_tag_id"]
-                    if agile_tag_id in agile_type_id:
+            logging.info("get result_dict:%s" % result_dict)
+            for tips_item in result_dict["suggest"]["tips-suggest"]:
+                for hit_item in tips_item["options"]:
+                    if hit_item["_source"]["ori_name"] not in have_read_tips_set:
+                        agile_tag_id = hit_item["_source"]["agile_tag_id"]
+                        if agile_tag_id in agile_type_id:
+                            have_read_tips_set.add(hit_item["_source"]["ori_name"])
+                            highlight_marks = u'<ems>%s</ems>' % query
+                            hit_item["_source"]["highlight_name"] = hit_item["_source"]["ori_name"].replace(query,
+                                                                                                            highlight_marks)
+                            ori_name = hit_item["_source"]["ori_name"]
+                            results_num = hit_item["_source"]["results_num"]
+                            highlight_name = hit_item["_source"]["highlight_name"]
+
+                            ret_list.append(
+                                [{"ori_name": ori_name, "results_num": results_num, "highlight": highlight_name}])
+
+        else:
+            for tips_item in result_dict["suggest"]["tips-suggest"]:
+                for hit_item in tips_item["options"]:
+                    if hit_item["_source"]["ori_name"] not in have_read_tips_set:
                         have_read_tips_set.add(hit_item["_source"]["ori_name"])
                         highlight_marks = u'<ems>%s</ems>' % query
                         hit_item["_source"]["highlight_name"] = hit_item["_source"]["ori_name"].replace(query,

associate/utils/agile_tag_transfer.py

@@ -95,13 +95,12 @@ class TagTransfer(object):
     def set_data_to_redis(self, instance):
         try:
             query_key = "query:associate_tip:tag_id:"
-
             name = agile_tag.AgileTag.objects.filter(id=instance.agile_tag_id).values_list("name", flat=True).first()
-
             tractate_results = TagTransfer.get_tractate_data_name_mapping_results_to_redis(name)
+            if tractate_results == None:
+                tractate_results =0
             logging.info("get tractate_results:%s" % tractate_results)
             key = query_key + str(instance.agile_tag_id)
-
             redis_client.set(key, tractate_results)
 
         except: