Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

fix bug in getTopFeatures.py with date

predictDiary.py

@@ -99,7 +99,7 @@ if __name__ == "__main__":
             for device_id in device_id_list:
                 router(device_id)
 
-        end = time.time()
-        time_cost = (end - start)
-        print("预测耗时{}秒".format(time_cost))
+            end = time.time()
+            time_cost = (end - start)
+            print("预测耗时{}秒".format(time_cost))
 

userProfile.py

@@ -4,11 +4,12 @@ from datetime import datetime
 
 # 获取当下一分钟内活跃用户
 def get_active_users():
-    now = datetime.now()
-    now_start = str(now)[:16] + ":00"
-    now_end = str(now)[:16] + ":59"
-    sql = "select device_id from user_active_time " \
-          "where active_time <= '{}' and active_time >= '{}'".format(now_end,now_start)
+    # now = datetime.now()
+    # now_start = str(now)[:16] + ":00"
+    # now_end = str(now)[:16] + ":59"
+    # sql = "select device_id from user_active_time " \
+    #       "where active_time <= '{}' and active_time >= '{}'".format(now_end,now_start)
+    sql = "select device_id from user_active_time order by active_time desc limit 10"
     device_id_df = con_sql(sql)
     if device_id_df.empty:
         print("当下这一分钟没有活跃用户，不需要预测")

utils.py

@@ -20,13 +20,14 @@ class Database:
     def __init__(self):
         self.host = '10.30.50.58'
         self.port = 6379
+        self.db = 12
         self.write_pool = {}
 
     def add_write(self, key,val):
         self.write_pool[key] = val
 
     def batch_write(self):
-        r = redis.StrictRedis(host=self.host, port=self.port)
+        r = redis.StrictRedis(host=self.host, port=self.port, db= self.db)
         r.mset(self.write_pool)
 # 把数据写到redis里
 def add_data_to_redis(key,val):