change test file

monitor.py

@@ -34,8 +34,8 @@ def maidian(x):
     try:
         data = x[1]
         if 'type' in data and 'device' in data and 'params' in data and 'card_content_type' in data['params'] \
-                and data['type'] == 'on_click_card' and data['params']['card_content_type'] == 'diary' \
-                and data["device"]['device_id'] == "E417C286-40A4-42F6-BDA9-AEEBD8FEC3B6":
+                and data['type'] == 'on_click_card' and data['params']['card_content_type'] == 'diary':
+            # and data["device"]['device_id'] == "E417C286-40A4-42F6-BDA9-AEEBD8FEC3B6"
             print("get device id")
             return True
 
@@ -85,7 +85,7 @@ def write_redis(device_id,cid_list):
                     print("insert one")
                 else:
                     r.set(key, json.dumps(cids))
-                    r.expire(key, 8*60*60)
+                    r.expire(key, 60*60)
                     print("insert two")
     except Exception as e:
         print("insert redis fail")
@@ -94,8 +94,9 @@ def write_redis(device_id,cid_list):
 
 def model(rdd):
     try:
-        rdd.filter(lambda x: maidian(x)).map(lambda x:get_data(x).na.drop().groupByKey())\
-            .map(lambda x:write_redis(x[0],x[1]))
+        rdd.filter(lambda x: maidian(x)).map(lambda x:get_data(x))
+            #                                  .na.drop().groupByKey())\
+            # .map(lambda x:write_redis(x[0],x[1]))
     except Exception as e:
         print("fail")
         print(e)