feat: [tasks] 更改influxdb查询

isc_video_record/tasks.py

@@ -72,9 +72,10 @@ class Tasks:
                     'camera_index': camera['point_index_code']
                 },
                 'fields': {
-                    'value': online_info.get('online', 0)
+                    'value': online_info.get('online', 0),
+                    'collect_time': online_info['collectTime']
                 },
-                'time': online_info['collectTime']
+                'time': datetime.utcnow()
             })
         if len(measure_points):
             influxdb.reconnect()
@@ -101,26 +102,21 @@ class Tasks:
             'value': 0, 'camera_count': 0}
 
         # 获取摄像头在线\离线数量
-        collect_time = datetime.utcnow() - timedelta(minutes=5.1)
+        collect_time = datetime.utcnow() - timedelta(minutes=4.1)
         query_str = '''
-            select mode(value), count(value)
-            from one_week.isc_camera_status
-            where time >= '{}'
-            group by value
-        '''.format(collect_time)
+            select * from one_week.isc_camera_status
+            group by camera_code
+            order by time desc limit 1
+        '''
         status_res = list(influxdb.query(query_str))
         online_count = offline_count = 0
-        if status_res:
-            status_res = status_res[0]
-            for status in status_res:
-                if status['mode'] == 1:
-                    online_count = status['count']
+        for res in status_res:
+            for status in res:
+                if status['value'] == 1:
+                    online_count += 1
                 else:
-                    offline_count = status['count']
+                    offline_count += 1
                 collect_time = status['time']
-                if isinstance(collect_time, str):
-                    collect_time = datetime.strptime(
-                        collect_time, '%Y-%m-%dT%H:%M:%S.%fZ')
 
         mobiles = None
         if online_count <= 3:
@@ -212,4 +208,5 @@ if __name__ == '__main__':
     log_init(__name__, False)
     t = Tasks()
     # t.start()
-    t.run_moniter_hour()
+    # t.run_moniter_hour()
+    t.run_moniter_online()