liqian 3 سال پیش
والد
کامیت
f0b0a7be1f
2فایلهای تغییر یافته به همراه13 افزوده شده و 13 حذف شده
  1. 2 2
      config.py
  2. 11 11
      utils.py

+ 2 - 2
config.py

@@ -237,7 +237,7 @@ class ProductionConfig(BaseConfig):
 
 
 def set_config():
-    # return DevelopmentConfig()
-    return TestConfig()
+    return DevelopmentConfig()
+    # return TestConfig()
     # return PreProductionConfig()
     # return ProductionConfig()

+ 11 - 11
utils.py

@@ -169,23 +169,23 @@ def update_video_w_h_rate(video_ids, key_name):
     """
     # 获取数据
     if len(video_ids) == 1:
-        sql = "SELECT id, width/height w_h_rate " \
-              "FROM longvideo.wx_video " \
-              "WHERE width/height > 1 " \
-              "AND id IN ({});".format(video_ids[0])
+        sql = "SELECT id, width, height, rotate FROM longvideo.wx_video WHERE id = {};".format(video_ids[0])
     else:
-        sql = "SELECT id, width/height w_h_rate " \
-              "FROM longvideo.wx_video " \
-              "WHERE width/height > 1 " \
-              "AND id IN {};".format(tuple(video_ids))
+        sql = "SELECT id, width, height, rotate FROM longvideo.wx_video WHERE id IN {};".format(tuple(video_ids))
 
     mysql_helper = MysqlHelper()
     data = mysql_helper.get_data(sql=sql)
 
     # 更新到redis
     info_data = {}
-    for video_id, w_h_rate in data:
-        info_data[int(video_id)] = float(w_h_rate)
+    for video_id, width, height, rotate in data:
+        # rotate 字段值为 90或270时,width和height的值相反
+        if rotate in (90, 270):
+            w_h_rate = height / width
+        else:
+            w_h_rate = width / height
+        if w_h_rate > 1:
+            info_data[int(video_id)] = float(w_h_rate)
     redis_helper = RedisHelper()
     # 删除旧数据
     redis_helper.del_keys(key_name=key_name)
@@ -199,5 +199,5 @@ if __name__ == '__main__':
     # data_normalization(data_test)
     # request_post(request_url=config_.NOTIFY_BACKEND_UPDATE_ROV_SCORE_URL, request_data={'videos': []})
     video_ids = [110, 112, 113, 115, 116, 117, 118]
-    # update_video_w_h_rate(video_ids=video_ids)
+    update_video_w_h_rate(video_ids=video_ids, key_name='')