Merge branch 'test'

moment/views/consum.py

@@ -24,10 +24,12 @@ def kafka_consum(topic_name=None):
     consumser_obj = KafkaConsumer(topic_name, bootstrap_servers=[settings.KAFKA_BROKER_LIST], enable_auto_commit=False,
                                   auto_commit_interval_ms=100, group_id="vest")
 
+    consumser_obj.subscribe([topic_name, ])
+    consumser_obj.seek()
     try:
         while True:
             msg_dict = consumser_obj.poll(timeout_ms=100, max_records=50)
-
+            consumser_obj.commit_async()
             for msg_key in msg_dict:
                 consume_msg = msg_dict[msg_key]
                 for msg in consume_msg:
@@ -112,7 +114,6 @@ def kafka_consum(topic_name=None):
                             save_data_to_kafka(card_info)
                             pass
 
-                    consumser_obj.commit_async()
     except:
         consumser_obj.close()
         logging_exception()

moment/views/irrigation.py

@@ -17,7 +17,8 @@ def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time=""
     try:
 
         producer = KafkaProducer(bootstrap_servers=[settings.KAFKA_BROKER_LIST])
-        logging.info("-----------------------------------------------")
+        logging.info("新数据进来了:%s" % card_id)
+
         topic = settings.KAFKA_TOPIC_NAME
         tag_list = ["瘦脸针kyc", "双眼皮kyc", "水光针kyc", "玻尿酸kyc", "吸脂kyc", "祛痘kyc", "鼻综合kyc", "光子嫩肤kyc", "没有想法kyc",
                     "牙齿kyc", "抗衰紧致kyc", "胸部kyc", "果酸换肤kyc", "祛斑kyc", "美白针kyc", "瘦腿针kyc"]

moment/views/process_time.py

@@ -94,6 +94,8 @@ def get_one_six_days_random_time(frmt='%Y-%m-%d %H:%M:%S', num_days=0, action_ty
 def get_ten_last_days_random_time(num_days=None, frmt='%Y-%m-%d %H:%M:%S', action_type=None, content_level=0,
                                   content_day_need_add_one_day=False):
     try:
+        if num_days == None:
+            return []
         ##比较当前时间和最后一次创建时间的差
         now = datetime.datetime.now()
         zeroday = datetime.datetime(now.year, now.month, now.day, 10, 0, 0)